Skip to content

Commit 37d4ec7

Browse files
committed
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: nodejs/node#48522 Fixes: nodejs/node#42302 Refs: nodejs/node#39069 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent c2bfac7 commit 37d4ec7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

graal-nodejs/configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1500,7 +1500,7 @@ def configure_node(o):
15001500
o['variables']['shlib_suffix'] = shlib_suffix
15011501

15021502
if options.linked_module:
1503-
o['variables']['library_files'] = options.linked_module
1503+
o['variables']['linked_module_files'] = options.linked_module
15041504

15051505
o['variables']['asan'] = int(options.enable_asan or 0)
15061506
o['variables']['v8_inspector'] = 'false'

graal-nodejs/node.gyp

Lines changed: 4 additions & 0 deletions
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',
@@ -989,6 +992,7 @@
989992
'<@(_outputs)',
990993
'config.gypi',
991994
'<@(deps_files)',
995+
'<@(linked_module_files)',
992996
],
993997
},
994998
],

0 commit comments

Comments
 (0)