Commit 3482bca
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 61b4a98 commit 3482bca
3 files changed
Lines changed: 7 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -152,7 +152,7 @@ out/Makefile: config.gypi common.gypi node.gyp \ | |||
| 152 | 152 | # and included in config.gypi | |
| 153 | 153 | config.gypi: configure configure.py src/node_version.h | |
| 154 | 154 | @if [ -x config.status ]; then \ | |
| 155 | - ./config.status; \ | ||
| 155 | + export PATH="$(NO_BIN_OVERRIDE_PATH)" && ./config.status; \ | ||
| 156 | 156 | else \ | |
| 157 | 157 | echo Missing or stale $@, please run ./$<; \ | |
| 158 | 158 | exit 1; \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1905,6 +1905,10 @@ def make_bin_override(): | |||
| 1905 | 1905 | if options.compile_commands_json: | |
| 1906 | 1906 | gyp_args += ['-f', 'compile_commands_json'] | |
| 1907 | 1907 | ||
| 1908 | + # override the variable `python` defined in common.gypi | ||
| 1909 | + if bin_override is not None: | ||
| 1910 | + gyp_args += ['-Dpython=' + sys.executable] | ||
| 1911 | + | ||
| 1908 | 1912 | # pass the leftover positional arguments to GYP | |
| 1909 | 1913 | gyp_args += args | |
| 1910 | 1914 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -745,7 +745,7 @@ | |||
| 745 | 745 | 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'], | |
| 746 | 746 | 'process_outputs_as_sources': 1, | |
| 747 | 747 | 'action': [ | |
| 748 | - 'python', | ||
| 748 | + '<(python)', | ||
| 749 | 749 | 'tools/mkssldef.py', | |
| 750 | 750 | '<@(mkssldef_flags)', | |
| 751 | 751 | '-o', | |
@@ -771,7 +771,7 @@ | |||
| 771 | 771 | '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', | |
| 772 | 772 | ], | |
| 773 | 773 | 'action': [ | |
| 774 | - 'python', | ||
| 774 | + '<(python)', | ||
| 775 | 775 | 'tools/js2c.py', | |
| 776 | 776 | '--directory', | |
| 777 | 777 | 'lib', | |
0 commit comments