Skip to content

Commit c5f5bcb

Browse files
danbevjasnell
authored andcommitted
build: fix config.gypi target
The config.gypi target has a recipe that uses the control function error to report if the config.gypi file is missing or if it is stale (the configure file was updated which is a prerequisite of this rule). GNU make has two phases, immediate and deferred. During the first phase it will expand any variables or functions as the makefile is parsed. The recipe in this case is a shell if statement, which is a deferred construct. But the control function $(error) is an immediate construct which will cause the makefile processing to stop during the first phase of the Make process. If I understand this correctly the only possible outcome of this rule is the "Stale config.gypi, please re-run ./configure" message which will be done in the first phase and then exit. The shell condition will not be considered. So it will never report that the config.gypi is missing. bnoordhuis suggested that we simply change this into a single error message: "Missing or stale config.gypi, please run configure" PR-URL: #9053 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]>
1 parent c258dc8 commit c5f5bcb

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
7878
$(PYTHON) tools/gyp_node.py -f make
7979

8080
config.gypi: configure
81-
if [ -f $@ ]; then
82-
$(error Stale $@, please re-run ./configure)
83-
else
84-
$(error No $@, please run ./configure first)
85-
fi
81+
$(error Missing or stale $@, please run ./$<)
8682

8783
install: all
8884
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'

0 commit comments

Comments
 (0)