Skip to content

Commit f2eccb7

Browse files
richardlautargos
authored andcommitted
build: fix configure --link-module
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: #48522 Fixes: #42302 Refs: #39069 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 0e0dd1f commit f2eccb7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

configure.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ def configure_node(o):
14641464
o['variables']['shlib_suffix'] = shlib_suffix
14651465

14661466
if options.linked_module:
1467-
o['variables']['library_files'] = options.linked_module
1467+
o['variables']['linked_module_files'] = options.linked_module
14681468

14691469
o['variables']['asan'] = int(options.enable_asan or 0)
14701470

node.gyp

+4
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@
2929
'node_lib_target_name%': 'libnode',
3030
'node_intermediate_lib_type%': 'static_library',
3131
'node_builtin_modules_path%': '',
32+
'linked_module_files': [
33+
],
3234
# We list the deps/ files out instead of globbing them in js2c.py since we
3335
# only include a subset of all the files under these directories.
3436
# The lengths of their file names combined should not exceed the
3537
# Windows command length limit or there would be an error.
3638
# See https://docs.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/command-line-string-limitation
3739
'library_files': [
3840
'<@(node_library_files)',
41+
'<@(linked_module_files)',
3942
],
4043
'deps_files': [
4144
'deps/v8/tools/splaytree.mjs',
@@ -970,6 +973,7 @@
970973
'<@(_outputs)',
971974
'config.gypi',
972975
'<@(deps_files)',
976+
'<@(linked_module_files)',
973977
],
974978
},
975979
],

0 commit comments

Comments
 (0)