diff options
| author | Anna Henningsen <anna@addaleax.net> | 2017-10-22 13:23:14 +0200 |
|---|---|---|
| committer | Gibson Fahnestock <gibfahn@gmail.com> | 2017-10-31 00:15:11 +0000 |
| commit | 528edb2ea88c870f70d09ab01fe4b7ae70f4f75f (patch) | |
| tree | 5a1abab4bb3226ce549cbacc2d574545cb1120e6 | |
| parent | a62845565e32258e7c46a732397820a31ff1711a (diff) | |
| download | node-new-528edb2ea88c870f70d09ab01fe4b7ae70f4f75f.tar.gz | |
build: ignore empty folders in test-addons-napi
The same as https://github.com/nodejs/node/pull/16031 except
for N-API addons.
PR-URL: https://github.com/nodejs/node/pull/16380
Fixes: https://github.com/nodejs/node/issues/13521
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -299,7 +299,8 @@ test/addons/.buildstamp: config.gypi \ test/addons/.docbuildstamp # Cannot use $(wildcard test/addons/*/) here, it's evaluated before # embedded addons have been generated from the documentation. -# Ignore folders without binding.gyp (#14843) +# Ignore folders without binding.gyp +# (https://github.com/nodejs/node/issues/14843) @for dirname in test/addons/*/; do \ if [ ! -f "$$PWD/$${dirname}binding.gyp" ]; then \ continue; fi ; \ @@ -337,7 +338,11 @@ test/addons-napi/.buildstamp: config.gypi \ src/node_api.h src/node_api_types.h # Cannot use $(wildcard test/addons-napi/*/) here, it's evaluated before # embedded addons have been generated from the documentation. +# Ignore folders without binding.gyp +# (https://github.com/nodejs/node/issues/14843) @for dirname in test/addons-napi/*/; do \ + if [ ! -f "$$PWD/$${dirname}binding.gyp" ]; then \ + continue; fi ; \ printf "\nBuilding addon $$PWD/$$dirname\n" ; \ env MAKEFLAGS="-j1" $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp \ --loglevel=$(LOGLEVEL) rebuild \ |