Commit 950cc1d
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.
Ref: #8905
PR-URL: #7893
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>1 parent b4ba4af commit 950cc1d
1 file changed
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -147,7 +147,8 @@ ADDONS_BINDING_GYPS := \ | |||
| 147 | 147 | # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale. | |
| 148 | 148 | # Depends on node-gyp package.json so that build-addons is (re)executed when | |
| 149 | 149 | # node-gyp is updated as part of an npm update. | |
| 150 | - test/addons/.buildstamp: deps/npm/node_modules/node-gyp/package.json \ | ||
| 150 | + test/addons/.buildstamp: config.gypi \ | ||
| 151 | + deps/npm/node_modules/node-gyp/package.json \ | ||
| 151 | 152 | $(ADDONS_BINDING_GYPS) test/addons/.docbuildstamp | |
| 152 | 153 | # Cannot use $(wildcard test/addons/*/) here, it's evaluated before | |
| 153 | 154 | # embedded addons have been generated from the documentation. | |
0 commit comments