Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6551538

Browse filesBrowse files
richardlauRafaelGSS
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 24a8fa9 commit 6551538
Copy full SHA for 6551538

File tree

Expand file treeCollapse file tree

2 files changed

+5
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+5
-1
lines changed
Open diff view settings
Collapse file

‎configure.py‎

Copy file name to clipboardExpand all lines: configure.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ def configure_node(o):
14111411
o['variables']['shlib_suffix'] = shlib_suffix
14121412

14131413
if options.linked_module:
1414-
o['variables']['library_files'] = options.linked_module
1414+
o['variables']['linked_module_files'] = options.linked_module
14151415

14161416
o['variables']['asan'] = int(options.enable_asan or 0)
14171417

Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@
2727
'node_lib_target_name%': 'libnode',
2828
'node_intermediate_lib_type%': 'static_library',
2929
'node_builtin_modules_path%': '',
30+
'linked_module_files': [
31+
],
3032
# We list the deps/ files out instead of globbing them in js2c.cc since we
3133
# only include a subset of all the files under these directories.
3234
# The lengths of their file names combined should not exceed the
3335
# Windows command length limit or there would be an error.
3436
# See https://docs.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/command-line-string-limitation
3537
'library_files': [
3638
'<@(node_library_files)',
39+
'<@(linked_module_files)',
3740
],
3841
'deps_files': [
3942
'deps/v8/tools/splaytree.mjs',
@@ -946,6 +949,7 @@
946949
'lib',
947950
'config.gypi',
948951
'<@(deps_files)',
952+
'<@(linked_module_files)',
949953
],
950954
},
951955
],

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.