From eeaff74af2cb8a48db5d24943f3faa18f5def03a Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Wed, 27 Jul 2016 11:58:11 +0200 Subject: [PATCH] build: adding config.gypi dep to addons/.buildstamp Currently the build-addons target is called as part of the test target, and it has test/addons/.buildstamp as a dependency. When running ./configure --debug and later switching/ updating branches you can be in a situation where the config.gypi files in the addons build directories are using an incorrect value for default_configuration. Currently this can happen and you will get test errors as there are a few test that depend on the value of default_configuration to be Release. Ben Noordhuis provided the solution for this by adding a dependency to config.gypi, which is generated when running ./configure, and will correct this situation. This commit is related to #7860. Please see the dicussion in that issue regarding the test using hard-coded paths. PR-URL: https://github.com/nodejs/node/pull/7893 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Ben Noordhuis --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c8279682cc..8a232c0e34 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,8 @@ ADDONS_BINDING_SOURCES := \ # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale. # Depends on node-gyp package.json so that build-addons is (re)executed when # node-gyp is updated as part of an npm update. -test/addons/.buildstamp: deps/npm/node_modules/node-gyp/package.json \ +test/addons/.buildstamp: config.gypi \ + deps/npm/node_modules/node-gyp/package.json \ $(ADDONS_BINDING_GYPS) $(ADDONS_BINDING_SOURCES) \ deps/uv/include/*.h deps/v8/include/*.h \ src/node.h src/node_buffer.h src/node_object_wrap.h \