jiangcuo/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-05-09 09:08:46 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

build: fix configure --link-module

Browse Source 
Add the list of linked modules to the arguments for `js2c.py`. These
were unintentionally omitted when the build was previously refactored
to avoid command line length limits on Windows.

PR-URL: https://github.com/nodejs/node/pull/48522
Fixes: https://github.com/nodejs/node/issues/42302
Refs: https://github.com/nodejs/node/pull/39069
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Richard Lau 2023-06-24 15:36:14 +00:00 committed by GitHub
parent d9f394e607
commit ae9f919880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1411,7 +1411,7 @@ def configure_node(o):
o['variables']['shlib_suffix'] = shlib_suffix o['variables']['shlib_suffix'] = shlib_suffix
if options.linked_module: if options.linked_module:
o['variables']['library_files'] = options.linked_module o['variables']['linked_module_files'] = options.linked_module
o['variables']['asan'] = int(options.enable_asan or 0) o['variables']['asan'] = int(options.enable_asan or 0)

4
node.gyp
View File

@ -27,6 +27,8 @@
'node_lib_target_name%': 'libnode', 'node_lib_target_name%': 'libnode',
'node_intermediate_lib_type%': 'static_library', 'node_intermediate_lib_type%': 'static_library',
'node_builtin_modules_path%': '', 'node_builtin_modules_path%': '',
'linked_module_files': [
],
# We list the deps/ files out instead of globbing them in js2c.cc since we # We list the deps/ files out instead of globbing them in js2c.cc since we
# only include a subset of all the files under these directories. # only include a subset of all the files under these directories.
# The lengths of their file names combined should not exceed the # The lengths of their file names combined should not exceed the
@ -34,6 +36,7 @@
# 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': [
'<@(node_library_files)', '<@(node_library_files)',
'<@(linked_module_files)',
], ],
'deps_files': [ 'deps_files': [
'deps/v8/tools/splaytree.mjs', 'deps/v8/tools/splaytree.mjs',
@ -954,6 +957,7 @@
'lib', 'lib',
'config.gypi', 'config.gypi',
'<@(deps_files)', '<@(deps_files)',
'<@(linked_module_files)',
], ],
}, },
], ],