Commit 00ea738
build: fix dependencies on AIX
Addon tests were still starting to run before the node exp file
creation was complete.
- remove process_outputs_as_sources as it did not fix the
problem
- update create_expfile.sh so that exp file is created in a
temporary file and then renamed to final name so that
file is only visible once it is complete
- update target used in building Addons so that for
AIX it depends on the exp file being available
PR-URL: #8285
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>1 parent b3617fc commit 00ea738
3 files changed
Lines changed: 13 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -83,7 +83,8 @@ uninstall: | |||
| 83 | 83 | $(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)' | |
| 84 | 84 | ||
| 85 | 85 | clean: | |
| 86 | - -rm -rf out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE) | ||
| 86 | + -rm -rf out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE) \ | ||
| 87 | + out/$(BUILDTYPE)/node.exp | ||
| 87 | 88 | @if [ -d out ]; then find out/ -name '*.o' -o -name '*.a' -o -name '*.d' | xargs rm -rf; fi | |
| 88 | 89 | -rm -rf node_modules | |
| 89 | 90 | @if [ -d deps/icu ]; then echo deleting deps/icu; rm -rf deps/icu; fi | |
@@ -128,7 +129,13 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE) | |||
| 128 | 129 | --nodedir="$(shell pwd)" | |
| 129 | 130 | ||
| 130 | 131 | # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale. | |
| 131 | - test/addons/.docbuildstamp: tools/doc/addon-verify.js doc/api/addons.md | ||
| 132 | + DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.js doc/api/addons.md | ||
| 133 | + | ||
| 134 | + ifeq ($(OSTYPE),aix) | ||
| 135 | + DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp | ||
| 136 | + endif | ||
| 137 | + | ||
| 138 | + test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS) | ||
| 132 | 139 | $(RM) -r test/addons/??_*/ | |
| 133 | 140 | $(NODE) $< | |
| 134 | 141 | touch $@ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -731,7 +731,6 @@ | |||
| 731 | 731 | }, | |
| 732 | 732 | { | |
| 733 | 733 | 'target_name': 'node_exp', | |
| 734 | - 'process_outputs_as_sources': 1, | ||
| 735 | 734 | 'type': 'none', | |
| 736 | 735 | 'dependencies': [ | |
| 737 | 736 | '<(node_core_target_name)', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | echo "Searching $1 to write out expfile to $2" | |
| 37 | 37 | ||
| 38 | 38 | # this special sequence must be at the start of the exp file | |
| 39 | - echo "#!." > $2 | ||
| 39 | + echo "#!." > $2.tmp | ||
| 40 | 40 | ||
| 41 | 41 | # pull the symbols from the .a files | |
| 42 | 42 | find $1 -name "*.a" | grep -v gtest \ | |
@@ -45,4 +45,6 @@ find $1 -name "*.a" | grep -v gtest \ | |||
| 45 | 45 | if ((($2 == "T") || ($2 == "D") || ($2 == "B")) && | |
| 46 | 46 | (substr($3,1,1) != ".")) { print $3 } | |
| 47 | 47 | }' \ | |
| 48 | - | sort -u >> $2 | ||
| 48 | + | sort -u >> $2.tmp | ||
| 49 | + | ||
| 50 | + mv -f $2.tmp $2 | ||
0 commit comments