build: override python executable path on configure

PR-URL: #39465 Fixes: #39408 Fixes: #39456 Reviewed-By: Zeyu Yang <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
nodejs · Aug 2, 2021 · a8961bc · a8961bc
1 parent 869ced9
commit a8961bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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',