Commit 8705263
build: add library_files to gyp variables
GYP uses the system path when parsing node.gyp;
However, if system python is different from our
gyp runtime python, like '2.7', gyp would crash.
Co-authored-by: Michaël Zasso <targos@protonmail.com>
PR-URL: #39293
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>1 parent 0e22115 commit 8705263
3 files changed
Lines changed: 5 additions & 23 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -44,6 +44,7 @@ | |||
| 44 | 44 | import getmoduleversion | |
| 45 | 45 | import getnapibuildversion | |
| 46 | 46 | from gyp_node import run_gyp | |
| 47 | + from utils import SearchFiles | ||
| 47 | 48 | ||
| 48 | 49 | # imports in deps/v8/tools/node | |
| 49 | 50 | sys.path.insert(0, os.path.join('deps', 'v8', 'tools', 'node')) | |
@@ -1062,6 +1063,8 @@ def gcc_version_ge(version_checked): | |||
| 1062 | 1063 | return False | |
| 1063 | 1064 | return True | |
| 1064 | 1065 | ||
| 1066 | + def configure_node_lib_files(o): | ||
| 1067 | + o['variables']['node_library_files'] = SearchFiles('lib', 'js') | ||
| 1065 | 1068 | ||
| 1066 | 1069 | def configure_node(o): | |
| 1067 | 1070 | if options.dest_os == 'android': | |
@@ -1805,6 +1808,7 @@ def make_bin_override(): | |||
| 1805 | 1808 | flavor = GetFlavor(flavor_params) | |
| 1806 | 1809 | ||
| 1807 | 1810 | configure_node(output) | |
| 1811 | + configure_node_lib_files(output) | ||
| 1808 | 1812 | configure_napi(output) | |
| 1809 | 1813 | configure_library('zlib', output) | |
| 1810 | 1814 | configure_library('http_parser', output) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,7 @@ | |||
| 33 | 33 | # Windows command length limit or there would be an error. | |
| 34 | 34 | # See https://docs.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/command-line-string-limitation | |
| 35 | 35 | 'library_files': [ | |
| 36 | - '<!@(python tools/search_files.py --ext js lib)', | ||
| 36 | + '<@(node_library_files)', | ||
| 37 | 37 | ], | |
| 38 | 38 | 'deps_files': [ | |
| 39 | 39 | 'deps/v8/tools/splaytree.js', | |
This file was deleted.
0 commit comments