Commit 58255e7
build: respect the NODE env variable in Makefile
PR-URL: #51743
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>1 parent 0ad88f6 commit 58255e7
1 file changed
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -77,7 +77,8 @@ EXEEXT := $(shell $(PYTHON) -c \ | |||
| 77 | 77 | "import sys; print('.exe' if sys.platform == 'win32' else '')") | |
| 78 | 78 | ||
| 79 | 79 | NODE_EXE = node$(EXEEXT) | |
| 80 | - NODE ?= ./$(NODE_EXE) | ||
| 80 | + # Use $(PWD) so we can cd to anywhere before calling this | ||
| 81 | + NODE ?= "$(PWD)/$(NODE_EXE)" | ||
| 81 | 82 | NODE_G_EXE = node_g$(EXEEXT) | |
| 82 | 83 | NPM ?= ./deps/npm/bin/npm-cli.js | |
| 83 | 84 | ||
@@ -91,10 +92,9 @@ BUILD_RELEASE_FLAGS ?= $(BUILD_DOWNLOAD_FLAGS) $(BUILD_INTL_FLAGS) | |||
| 91 | 92 | V ?= 0 | |
| 92 | 93 | ||
| 93 | 94 | # Use -e to double check in case it's a broken link | |
| 94 | - # Use $(PWD) so we can cd to anywhere before calling this | ||
| 95 | 95 | available-node = \ | |
| 96 | - if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \ | ||
| 97 | - $(PWD)/$(NODE) $(1); \ | ||
| 96 | + if [ -x "$(NODE)" ] && [ -e "$(NODE)" ]; then \ | ||
| 97 | + "$(NODE)" $(1); \ | ||
| 98 | 98 | elif [ -x `command -v node` ] && [ -e `command -v node` ] && [ `command -v node` ]; then \ | |
| 99 | 99 | `command -v node` $(1); \ | |
| 100 | 100 | else \ | |
0 commit comments