summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGregor <gregor@martynus.net>2017-10-06 12:21:51 -0700
committerMichael Dawson <michael_dawson@ca.ibm.com>2017-10-11 16:03:48 -0400
commit7da45f87da65c859dc40a2bf3eea3d9da064f41d (patch)
tree1879920a28fbc3c91685c9564126ed82e5cc21af /Makefile
parent49577269e25fa2ea585d9005cff6e7167c85b258 (diff)
downloadandroid-node-v8-7da45f87da65c859dc40a2bf3eea3d9da064f41d.tar.gz
android-node-v8-7da45f87da65c859dc40a2bf3eea3d9da064f41d.tar.bz2
android-node-v8-7da45f87da65c859dc40a2bf3eea3d9da064f41d.zip
build: ignore empty folders in test-addons
Fixes: https://github.com/nodejs/node/issues/14843 PR-URL: https://github.com/nodejs/node/pull/16031 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d917056b11..56e7caef83 100644
--- a/Makefile
+++ b/Makefile
@@ -267,7 +267,10 @@ 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)
@for dirname in test/addons/*/; 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 \