diff options
| author | legendecas <legendecas@gmail.com> | 2021-07-20 18:00:19 +0800 |
|---|---|---|
| committer | legendecas <legendecas@gmail.com> | 2021-07-30 01:20:00 +0800 |
| commit | 9b5aa8d99eae07831407cf4a6ffda079c42e19bf (patch) | |
| tree | 29bb700e7e2aae0c3171c9c2b0a016a64638a61f | |
| parent | bd33fdfadf1ffd79c99b4057bd2dc32c520e94d2 (diff) | |
| download | node-new-9b5aa8d99eae07831407cf4a6ffda079c42e19bf.tar.gz | |
build: override python executable path on configure
PR-URL: https://github.com/nodejs/node/pull/39465
Fixes: https://github.com/nodejs/node/issues/39408
Fixes: https://github.com/nodejs/node/issues/39456
Reviewed-By: Zeyu Yang <himself65@outlook.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure.py | 4 | ||||
| -rw-r--r-- | node.gyp | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -153,7 +153,7 @@ out/Makefile: config.gypi common.gypi node.gyp \ # and included in config.gypi config.gypi: configure configure.py src/node_version.h @if [ -x config.status ]; then \ - ./config.status; \ + export PATH="$(NO_BIN_OVERRIDE_PATH)" && ./config.status; \ else \ echo Missing or stale $@, please run ./$<; \ exit 1; \ diff --git a/configure.py b/configure.py index a4c4d26987..9327d6e5f5 100755 --- a/configure.py +++ b/configure.py @@ -2005,6 +2005,10 @@ else: if options.compile_commands_json: gyp_args += ['-f', 'compile_commands_json'] +# override the variable `python` defined in common.gypi +if bin_override is not None: + gyp_args += ['-Dpython=' + sys.executable] + # pass the leftover positional arguments to GYP gyp_args += args @@ -790,7 +790,7 @@ 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'], 'process_outputs_as_sources': 1, 'action': [ - 'python', + '<(python)', 'tools/mkssldef.py', '<@(mkssldef_flags)', '-o', @@ -816,7 +816,7 @@ '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', ], 'action': [ - 'python', + '<(python)', 'tools/js2c.py', '--directory', 'lib', |