mirror of
https://github.com/nodejs/node.git
synced 2025-04-28 21:46:48 +00:00
build: fix building when there is only python3
PR-URL: https://github.com/nodejs/node/pull/48462 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
This commit is contained in:
parent
89a26b451e
commit
d1ccca9d2b
15
configure.py
15
configure.py
@ -2121,6 +2121,17 @@ write('config.mk', do_not_edit + config_str)
|
|||||||
gyp_args = ['--no-parallel', '-Dconfiguring_node=1']
|
gyp_args = ['--no-parallel', '-Dconfiguring_node=1']
|
||||||
gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']]
|
gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']]
|
||||||
|
|
||||||
|
# Remove the trailing .exe from the executable name, otherwise the python.exe
|
||||||
|
# would be rewrote as python_host.exe due to hack in GYP for supporting cross
|
||||||
|
# compilation on Windows.
|
||||||
|
# See https://github.com/nodejs/node/pull/32867 for related change.
|
||||||
|
python = sys.executable
|
||||||
|
if flavor == 'win' and python.lower().endswith('.exe'):
|
||||||
|
python = python[:-4]
|
||||||
|
# Always set 'python' variable, otherwise environments that only have python3
|
||||||
|
# will fail to run python scripts.
|
||||||
|
gyp_args += ['-Dpython=' + python]
|
||||||
|
|
||||||
if options.use_ninja:
|
if options.use_ninja:
|
||||||
gyp_args += ['-f', 'ninja-' + flavor]
|
gyp_args += ['-f', 'ninja-' + flavor]
|
||||||
elif flavor == 'win' and sys.platform != 'msys':
|
elif flavor == 'win' and sys.platform != 'msys':
|
||||||
@ -2133,10 +2144,6 @@ if options.compile_commands_json:
|
|||||||
os.path.islink('./compile_commands.json') and os.unlink('./compile_commands.json')
|
os.path.islink('./compile_commands.json') and os.unlink('./compile_commands.json')
|
||||||
os.symlink('./out/' + config['BUILDTYPE'] + '/compile_commands.json', './compile_commands.json')
|
os.symlink('./out/' + config['BUILDTYPE'] + '/compile_commands.json', './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 non-whitespace positional arguments to GYP
|
# pass the leftover non-whitespace positional arguments to GYP
|
||||||
gyp_args += [arg for arg in args if not str.isspace(arg)]
|
gyp_args += [arg for arg in args if not str.isspace(arg)]
|
||||||
|
|
||||||
|
4
node.gyp
4
node.gyp
@ -762,7 +762,7 @@
|
|||||||
'<(fipsmodule)',
|
'<(fipsmodule)',
|
||||||
],
|
],
|
||||||
'action': [
|
'action': [
|
||||||
'python', 'tools/copyfile.py',
|
'<(python)', 'tools/copyfile.py',
|
||||||
'<(fipsmodule_internal)',
|
'<(fipsmodule_internal)',
|
||||||
'<(fipsmodule)',
|
'<(fipsmodule)',
|
||||||
],
|
],
|
||||||
@ -772,7 +772,7 @@
|
|||||||
'inputs': [ '<(opensslconfig)', ],
|
'inputs': [ '<(opensslconfig)', ],
|
||||||
'outputs': [ '<(opensslconfig_internal)', ],
|
'outputs': [ '<(opensslconfig_internal)', ],
|
||||||
'action': [
|
'action': [
|
||||||
'python', 'tools/enable_fips_include.py',
|
'<(python)', 'tools/enable_fips_include.py',
|
||||||
'<(opensslconfig)',
|
'<(opensslconfig)',
|
||||||
'<(opensslconfig_internal)',
|
'<(opensslconfig_internal)',
|
||||||
'<(fipsconfig)',
|
'<(fipsconfig)',
|
||||||
|
@ -438,6 +438,7 @@ def _BuildCommandLineForRuleRaw(
|
|||||||
# Support a mode for using cmd directly.
|
# Support a mode for using cmd directly.
|
||||||
# Convert any paths to native form (first element is used directly).
|
# Convert any paths to native form (first element is used directly).
|
||||||
# TODO(quote): regularize quoting path names throughout the module
|
# TODO(quote): regularize quoting path names throughout the module
|
||||||
|
command[1] = '"%s"' % command[1]
|
||||||
arguments = ['"%s"' % i for i in arguments]
|
arguments = ['"%s"' % i for i in arguments]
|
||||||
# Collapse into a single command.
|
# Collapse into a single command.
|
||||||
return input_dir_preamble + " ".join(command + arguments)
|
return input_dir_preamble + " ".join(command + arguments)
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
'has_valgrind%': 0,
|
'has_valgrind%': 0,
|
||||||
'coverage%': 0,
|
'coverage%': 0,
|
||||||
'v8_target_arch%': '<(target_arch)',
|
'v8_target_arch%': '<(target_arch)',
|
||||||
'v8_host_byteorder%': '<!(python -c "import sys; print(sys.byteorder)")',
|
'v8_host_byteorder%': '<!("<(python)" -c "import sys; print(sys.byteorder)")',
|
||||||
'force_dynamic_crt%': 0,
|
'force_dynamic_crt%': 0,
|
||||||
|
|
||||||
# Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
|
# Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
|
||||||
|
Loading…
Reference in New Issue
Block a user