From 528edb2ea88c870f70d09ab01fe4b7ae70f4f75f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 22 Oct 2017 13:23:14 +0200 Subject: [PATCH] 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 Reviewed-By: Daniel Bevenius Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Yuta Hiroto Reviewed-By: Gireesh Punathil Reviewed-By: Michael Dawson --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f051b3aaf1c008..1d7d3799f02cc4 100644 --- a/Makefile +++ b/Makefile @@ -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 \