Commit 660c515
build: move available-node variable to top
Currently node_use_openssl uses the available-node variable before it is
defined causing the conditions that use it before that point to
evaluate incorrectly. As an example running the target
test/addons/.docbuildstamp will currently be skipped:
$ make test/addons/.docbuildstamp
Skipping .docbuildstamp (no crypto)
With this commit the target will only be skipped if configured --without-ssl.
PR-URL: #22356
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent fbc189b commit 660c515
1 file changed
Lines changed: 12 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -58,6 +58,18 @@ BUILD_RELEASE_FLAGS ?= $(BUILD_DOWNLOAD_FLAGS) $(BUILD_INTL_FLAGS) | |||
| 58 | 58 | # or set the V environment variable to an empty string. | |
| 59 | 59 | V ?= 1 | |
| 60 | 60 | ||
| 61 | + # Use -e to double check in case it's a broken link | ||
| 62 | + # Use $(PWD) so we can cd to anywhere before calling this | ||
| 63 | + available-node = \ | ||
| 64 | + if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \ | ||
| 65 | + $(PWD)/$(NODE) $(1); \ | ||
| 66 | + elif [ -x `which node` ] && [ -e `which node` ] && [ `which node` ]; then \ | ||
| 67 | + `which node` $(1); \ | ||
| 68 | + else \ | ||
| 69 | + echo "No available node, cannot run \"node $(1)\""; \ | ||
| 70 | + exit 1; \ | ||
| 71 | + fi; | ||
| 72 | + | ||
| 61 | 73 | .PHONY: all | |
| 62 | 74 | # BUILDTYPE=Debug builds both release and debug builds. If you want to compile | |
| 63 | 75 | # just the debug build, run `make -C out BUILDTYPE=Debug` instead. | |
@@ -629,17 +641,6 @@ out/doc/api/assets: | |||
| 629 | 641 | out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets | |
| 630 | 642 | @cp $< $@ | |
| 631 | 643 | ||
| 632 | - # Use -e to double check in case it's a broken link | ||
| 633 | - # Use $(PWD) so we can cd to anywhere before calling this | ||
| 634 | - available-node = \ | ||
| 635 | - if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \ | ||
| 636 | - $(PWD)/$(NODE) $(1); \ | ||
| 637 | - elif [ -x `which node` ] && [ -e `which node` ] && [ `which node` ]; then \ | ||
| 638 | - `which node` $(1); \ | ||
| 639 | - else \ | ||
| 640 | - echo "No available node, cannot run \"node $(1)\""; \ | ||
| 641 | - exit 1; \ | ||
| 642 | - fi; | ||
| 643 | 644 | ||
| 644 | 645 | run-npm-install = $(PWD)/$(NPM) install --production --no-package-lock | |
| 645 | 646 | run-npm-ci = $(PWD)/$(NPM) ci | |
0 commit comments