Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 636cf22

Browse filesBrowse files
danbevcjihrig
danbev
authored and
cjihrig
committed
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: #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 bb90867 commit 636cf22
Copy full SHA for 636cf22

File tree

Expand file treeCollapse file tree

1 file changed

+2
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-1
lines changed
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ ADDONS_BINDING_SOURCES := \
150150
# Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
151151
# Depends on node-gyp package.json so that build-addons is (re)executed when
152152
# node-gyp is updated as part of an npm update.
153-
test/addons/.buildstamp: deps/npm/node_modules/node-gyp/package.json \
153+
test/addons/.buildstamp: config.gypi \
154+
deps/npm/node_modules/node-gyp/package.json \
154155
$(ADDONS_BINDING_GYPS) $(ADDONS_BINDING_SOURCES) \
155156
deps/uv/include/*.h deps/v8/include/*.h \
156157
src/node.h src/node_buffer.h src/node_object_wrap.h \

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.