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>
This commit is contained in:
parent
bd33fdfadf
commit
9b5aa8d99e
2
Makefile
2
Makefile
@ -153,7 +153,7 @@ out/Makefile: config.gypi common.gypi node.gyp \
|
|||||||
# and included in config.gypi
|
# and included in config.gypi
|
||||||
config.gypi: configure configure.py src/node_version.h
|
config.gypi: configure configure.py src/node_version.h
|
||||||
@if [ -x config.status ]; then \
|
@if [ -x config.status ]; then \
|
||||||
./config.status; \
|
export PATH="$(NO_BIN_OVERRIDE_PATH)" && ./config.status; \
|
||||||
else \
|
else \
|
||||||
echo Missing or stale $@, please run ./$<; \
|
echo Missing or stale $@, please run ./$<; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
|
@ -2005,6 +2005,10 @@ else:
|
|||||||
if options.compile_commands_json:
|
if options.compile_commands_json:
|
||||||
gyp_args += ['-f', '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
|
# pass the leftover positional arguments to GYP
|
||||||
gyp_args += args
|
gyp_args += args
|
||||||
|
|
||||||
|
4
node.gyp
4
node.gyp
@ -790,7 +790,7 @@
|
|||||||
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
|
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
|
||||||
'process_outputs_as_sources': 1,
|
'process_outputs_as_sources': 1,
|
||||||
'action': [
|
'action': [
|
||||||
'python',
|
'<(python)',
|
||||||
'tools/mkssldef.py',
|
'tools/mkssldef.py',
|
||||||
'<@(mkssldef_flags)',
|
'<@(mkssldef_flags)',
|
||||||
'-o',
|
'-o',
|
||||||
@ -816,7 +816,7 @@
|
|||||||
'<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
|
'<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
|
||||||
],
|
],
|
||||||
'action': [
|
'action': [
|
||||||
'python',
|
'<(python)',
|
||||||
'tools/js2c.py',
|
'tools/js2c.py',
|
||||||
'--directory',
|
'--directory',
|
||||||
'lib',
|
'lib',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user