diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2018-01-20 01:00:34 +0100 |
---|---|---|
committer | Ruben Bridgewater <ruben@bridgewater.de> | 2018-01-21 02:19:46 +0100 |
commit | d9b59def72c718aaad3eefb6bf43f409ccefe4d2 (patch) | |
tree | ec02442a3153500b91e368c873db4d1a3763e567 /node.gyp | |
parent | c6682636be4955e2181c00e7d4868fbf6682a5c5 (diff) | |
download | node-new-d9b59def72c718aaad3eefb6bf43f409ccefe4d2.tar.gz |
build,test: make building addon tests less fragile
* Get rid of recursive `make` when building the node binary. An earlier
commit makes GYP write out rules that we can use for proper dependency
tracking.
* Use module name 'binding' in addons.md and addons-napi/*/binding.gyp.
This massively simplifies the logic for generating the build rules.
* Check in auto-generated add-on tests from `doc/api/addons.md`. The
files change rarely and generating them dynamically causes no end of
race conditions and special-casing during the build.
PR-URL: https://github.com/nodejs/node/pull/17407
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'node.gyp')
-rw-r--r-- | node.gyp | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -533,14 +533,6 @@ # node_dtrace_ustack.o not supported on mac and linux # node_dtrace_provider.o All except OS X. "dtrace -G" is not # used on OS X. - # - # Note that node_dtrace_provider.cc and node_dtrace_ustack.cc do not - # actually exist. They're listed here to trick GYP into linking the - # corresponding object files into the final "node" executable. These - # object files are generated by "dtrace -G" using custom actions - # below, and the GYP-generated Makefiles will properly build them when - # needed. - # 'sources': [ 'src/node_dtrace.cc' ], 'conditions': [ [ 'OS=="linux"', { @@ -550,8 +542,8 @@ }], [ 'OS!="mac" and OS!="linux"', { 'sources': [ - 'src/node_dtrace_ustack.cc', - 'src/node_dtrace_provider.cc', + '<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_provider.o', + '<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_ustack.o', ] } ] ] |