summaryrefslogtreecommitdiff
path: root/tools/gyp
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-04-18 02:20:56 -0400
committerRefael Ackermann <refack@gmail.com>2017-05-11 08:10:16 -0400
commitbb88caec0680d098f4de936e1b2d09756344fca1 (patch)
treed8c685ac91a94d6e5b8877477fb9b5a80cef3e57 /tools/gyp
parentbee250c2326dc9424ff4b940d34a5bd7017022c1 (diff)
downloadandroid-node-v8-bb88caec0680d098f4de936e1b2d09756344fca1.tar.gz
android-node-v8-bb88caec0680d098f4de936e1b2d09756344fca1.tar.bz2
android-node-v8-bb88caec0680d098f4de936e1b2d09756344fca1.zip
build: fix ninja build failure
When working on commit 6a09a69ec9d36b705e9bde2ac1a193566a702d96 ("build: enable cctest to use generated objects") I did not take into account building with ninja: $ ./configure $ tools/gyp_node.py -f ninja $ ninja -C out/Release $ ln -fs out/Release/node node When ninja generated the ninja build files, src files that are relative to the src directory will be named with a dot instead of a path separator, for example: out/Release/obj/src/node/node.o would instead become: out/Release/obj/src/node.node.o This commit adds an additional variable for the type of object separator used for this case. Currently the check for if ninja is being used is a normal if statement as are the following os checks (win and aix). But the win and aix ones should only be evaluated if the build is not generated by ninja. This commit turns this logic into an if ninja else statement. PR-URL: https://github.com/nodejs/node/pull/12484 Fixes: https://github.com/nodejs/node/issues/12448 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Diffstat (limited to 'tools/gyp')
0 files changed, 0 insertions, 0 deletions