From 6c769ccedf494c5de51d4ff51f6eac129c6a94e6 Mon Sep 17 00:00:00 2001 From: legendecas Date: Tue, 20 Jul 2021 18:00:19 +0800 Subject: [PATCH] build: override python executable path on configure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-By: Tobias Nießen Reviewed-By: Michaël Zasso Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Joyee Cheung --- Makefile | 2 +- configure.py | 4 ++++ node.gyp | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 81907c9220f202..ec4c774748cd91 100644 --- a/Makefile +++ b/Makefile @@ -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 a4c4d26987cb10..9327d6e5f5da06 100755 --- a/configure.py +++ b/configure.py @@ -2005,6 +2005,10 @@ def make_bin_override(): 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 diff --git a/node.gyp b/node.gyp index 9c3ff581d64b59..0c11797baa2197 100644 --- a/node.gyp +++ b/node.gyp @@ -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',