Skip to content
This repository was archived by the owner on Aug 31, 2018. It is now read-only.

Commit 23e3591

Browse files
committed
build: ignore empty folders in test-addons-napi
The same as nodejs/node#16031 except for N-API addons. PR-URL: nodejs/node#16380 Fixes: nodejs/node#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>
1 parent 61fbe66 commit 23e3591

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ test/addons/.buildstamp: config.gypi \
302302
test/addons/.docbuildstamp
303303
# Cannot use $(wildcard test/addons/*/) here, it's evaluated before
304304
# embedded addons have been generated from the documentation.
305-
# Ignore folders without binding.gyp (#14843)
305+
# Ignore folders without binding.gyp
306+
# (https://github.com/nodejs/node/issues/14843)
306307
@for dirname in test/addons/*/; do \
307308
if [ ! -f "$$PWD/$${dirname}binding.gyp" ]; then \
308309
continue; fi ; \
@@ -340,7 +341,11 @@ test/addons-napi/.buildstamp: config.gypi \
340341
src/node_api.h src/node_api_types.h
341342
# Cannot use $(wildcard test/addons-napi/*/) here, it's evaluated before
342343
# embedded addons have been generated from the documentation.
344+
# Ignore folders without binding.gyp
345+
# (https://github.com/nodejs/node/issues/14843)
343346
@for dirname in test/addons-napi/*/; do \
347+
if [ ! -f "$$PWD/$${dirname}binding.gyp" ]; then \
348+
continue; fi ; \
344349
printf "\nBuilding addon $$PWD/$$dirname\n" ; \
345350
env MAKEFLAGS="-j1" $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp \
346351
--loglevel=$(LOGLEVEL) rebuild \

0 commit comments

Comments
 (0)