Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: use the same python executable to run configure and gyp #39498

Closed
wants to merge 1 commit into from
Closed

build: use the same python executable to run configure and gyp #39498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions configure.py
View file
Open in desktop
Expand Up @@ -1925,6 +1925,7 @@ def make_bin_override():

# Forward OSS-Fuzz settings
output['variables']['ossfuzz'] = b(options.ossfuzz)
output['variables']['python_exec'] = sys.executable

# variables should be a root level element,
# move everything else to target_defaults
Expand Down
5 changes: 3 additions & 2 deletions node.gyp
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
'node_lib_target_name%': 'libnode',
'node_intermediate_lib_type%': 'static_library',
'node_builtin_modules_path%': '',
'python_exec': 'python',
# We list the deps/ files out instead of globbing them in js2c.py since we
# only include a subset of all the files under these directories.
# The lengths of their file names combined should not exceed the
Expand Down Expand Up @@ -790,7 +791,7 @@
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
'process_outputs_as_sources': 1,
'action': [
'python',
'<(python_exec)',
'tools/mkssldef.py',
'<@(mkssldef_flags)',
'-o',
Expand All @@ -816,7 +817,7 @@
'<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
],
'action': [
'python',
'<(python_exec)',
'tools/js2c.py',
'--directory',
'lib',
Expand Down