Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6c769cc

Browse filesBrowse files
legendecastargos
legendecas
authored and
targos
committed
build: override python executable path on configure
PR-URL: #39465 Fixes: #39408 Fixes: #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>
1 parent 7b612fa commit 6c769cc
Copy full SHA for 6c769cc

3 files changed

+7-3Lines changed: 7 additions & 3 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion
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; \
Collapse file

‎configure.py‎

Copy file name to clipboardExpand all lines: configure.py
+4Lines changed: 4 additions & 0 deletions
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

Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
+2-2Lines changed: 2 additions & 2 deletions
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.