Skip to content

Commit 6c769cc

Browse files
legendecastargos
authored andcommitted
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]>
1 parent 7b612fa commit 6c769cc

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ out/Makefile: config.gypi common.gypi node.gyp \
153153
# and included in config.gypi
154154
config.gypi: configure configure.py src/node_version.h
155155
@if [ -x config.status ]; then \
156-
./config.status; \
156+
export PATH="$(NO_BIN_OVERRIDE_PATH)" && ./config.status; \
157157
else \
158158
echo Missing or stale $@, please run ./$<; \
159159
exit 1; \

Diff for: configure.py

+4
Original file line numberDiff line numberDiff line change
@@ -2005,6 +2005,10 @@ def make_bin_override():
20052005
if options.compile_commands_json:
20062006
gyp_args += ['-f', 'compile_commands_json']
20072007

2008+
# override the variable `python` defined in common.gypi
2009+
if bin_override is not None:
2010+
gyp_args += ['-Dpython=' + sys.executable]
2011+
20082012
# pass the leftover positional arguments to GYP
20092013
gyp_args += args
20102014

Diff for: node.gyp

+2-2
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@
790790
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
791791
'process_outputs_as_sources': 1,
792792
'action': [
793-
'python',
793+
'<(python)',
794794
'tools/mkssldef.py',
795795
'<@(mkssldef_flags)',
796796
'-o',
@@ -816,7 +816,7 @@
816816
'<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
817817
],
818818
'action': [
819-
'python',
819+
'<(python)',
820820
'tools/js2c.py',
821821
'--directory',
822822
'lib',

0 commit comments

Comments
 (0)