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: https://github.com/nodejs/node/pull/39293 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
This commit is contained in:
parent
c506660f32
commit
cfb7c4f658
@ -45,6 +45,7 @@ import getmoduleversion
|
|||||||
import getnapibuildversion
|
import getnapibuildversion
|
||||||
import getsharedopensslhasquic
|
import getsharedopensslhasquic
|
||||||
from gyp_node import run_gyp
|
from gyp_node import run_gyp
|
||||||
|
from utils import SearchFiles
|
||||||
|
|
||||||
# parse our options
|
# parse our options
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
@ -1155,6 +1156,8 @@ def gcc_version_ge(version_checked):
|
|||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def configure_node_lib_files(o):
|
||||||
|
o['variables']['node_library_files'] = SearchFiles('lib', 'js')
|
||||||
|
|
||||||
def configure_node(o):
|
def configure_node(o):
|
||||||
if options.dest_os == 'android':
|
if options.dest_os == 'android':
|
||||||
@ -1903,6 +1906,7 @@ if (options.dest_os):
|
|||||||
flavor = GetFlavor(flavor_params)
|
flavor = GetFlavor(flavor_params)
|
||||||
|
|
||||||
configure_node(output)
|
configure_node(output)
|
||||||
|
configure_node_lib_files(output)
|
||||||
configure_napi(output)
|
configure_napi(output)
|
||||||
configure_library('zlib', output)
|
configure_library('zlib', output)
|
||||||
configure_library('http_parser', output)
|
configure_library('http_parser', output)
|
||||||
|
2
node.gyp
2
node.gyp
@ -33,7 +33,7 @@
|
|||||||
# Windows command length limit or there would be an error.
|
# Windows command length limit or there would be an error.
|
||||||
# See https://docs.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/command-line-string-limitation
|
# See https://docs.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/command-line-string-limitation
|
||||||
'library_files': [
|
'library_files': [
|
||||||
'<!@(python tools/search_files.py --ext js lib)',
|
'<@(node_library_files)',
|
||||||
],
|
],
|
||||||
'deps_files': [
|
'deps_files': [
|
||||||
'deps/v8/tools/splaytree.mjs',
|
'deps/v8/tools/splaytree.mjs',
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
|
|
||||||
"""
|
|
||||||
This is a utility for recursively searching files under
|
|
||||||
a specified directory
|
|
||||||
"""
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import utils
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(
|
|
||||||
description='Search files with a specific extension under a directory',
|
|
||||||
fromfile_prefix_chars='@'
|
|
||||||
)
|
|
||||||
parser.add_argument('--ext', required=True, help='extension to search for')
|
|
||||||
parser.add_argument('directory', help='input directory')
|
|
||||||
options = parser.parse_args()
|
|
||||||
print('\n'.join(utils.SearchFiles(options.directory, options.ext)))
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
Loading…
x
Reference in New Issue
Block a user