Skip to content

Commit 1657f12

Browse files
committedAug 29, 2016
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 <[email protected]> Reviewed-By: Myles Borins <[email protected]>
1 parent c8619ea commit 1657f12

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed
 

‎Makefile

+9-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ uninstall:
8787
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
8888

8989
clean:
90-
-rm -rf out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE)
90+
-rm -rf out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE) \
91+
out/$(BUILDTYPE)/node.exp
9192
@if [ -d out ]; then find out/ -name '*.o' -o -name '*.a' -o -name '*.d' | xargs rm -rf; fi
9293
-rm -rf node_modules
9394
@if [ -d deps/icu ]; then echo deleting deps/icu; rm -rf deps/icu; fi
@@ -134,7 +135,13 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
134135
--nodedir="$(shell pwd)"
135136

136137
# Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
137-
test/addons/.docbuildstamp: tools/doc/addon-verify.js doc/api/addons.md
138+
DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.js doc/api/addons.md
139+
140+
ifeq ($(OSTYPE),aix)
141+
DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
142+
endif
143+
144+
test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS)
138145
$(RM) -r test/addons/??_*/
139146
$(NODE) $<
140147
touch $@

‎node.gyp

-1
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,6 @@
906906
},
907907
{
908908
'target_name': 'node_exp',
909-
'process_outputs_as_sources': 1,
910909
'type': 'none',
911910
'dependencies': [
912911
'<(node_core_target_name)',

‎tools/create_expfile.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
echo "Searching $1 to write out expfile to $2"
3737

3838
# this special sequence must be at the start of the exp file
39-
echo "#!." > $2
39+
echo "#!." > $2.tmp
4040

4141
# pull the symbols from the .a files
4242
find $1 -name "*.a" | grep -v gtest \
@@ -45,4 +45,6 @@ find $1 -name "*.a" | grep -v gtest \
4545
if ((($2 == "T") || ($2 == "D") || ($2 == "B")) &&
4646
(substr($3,1,1) != ".")) { print $3 }
4747
}' \
48-
| sort -u >> $2
48+
| sort -u >> $2.tmp
49+
50+
mv -f $2.tmp $2

0 commit comments

Comments
 (0)
Please sign in to comment.