Commit f2eccb7
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
2 files changed
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1464,7 +1464,7 @@ def configure_node(o): | |||
| 1464 | 1464 | o['variables']['shlib_suffix'] = shlib_suffix | |
| 1465 | 1465 | ||
| 1466 | 1466 | if options.linked_module: | |
| 1467 | - o['variables']['library_files'] = options.linked_module | ||
| 1467 | + o['variables']['linked_module_files'] = options.linked_module | ||
| 1468 | 1468 | ||
| 1469 | 1469 | o['variables']['asan'] = int(options.enable_asan or 0) | |
| 1470 | 1470 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,13 +29,16 @@ | |||
| 29 | 29 | 'node_lib_target_name%': 'libnode', | |
| 30 | 30 | 'node_intermediate_lib_type%': 'static_library', | |
| 31 | 31 | 'node_builtin_modules_path%': '', | |
| 32 | + 'linked_module_files': [ | ||
| 33 | + ], | ||
| 32 | 34 | # We list the deps/ files out instead of globbing them in js2c.py since we | |
| 33 | 35 | # only include a subset of all the files under these directories. | |
| 34 | 36 | # The lengths of their file names combined should not exceed the | |
| 35 | 37 | # Windows command length limit or there would be an error. | |
| 36 | 38 | # See https://docs.microsoft.com/en-us/troubleshoot/windows-client/shell-experience/command-line-string-limitation | |
| 37 | 39 | 'library_files': [ | |
| 38 | 40 | '<@(node_library_files)', | |
| 41 | + '<@(linked_module_files)', | ||
| 39 | 42 | ], | |
| 40 | 43 | 'deps_files': [ | |
| 41 | 44 | 'deps/v8/tools/splaytree.mjs', | |
@@ -970,6 +973,7 @@ | |||
| 970 | 973 | '<@(_outputs)', | |
| 971 | 974 | 'config.gypi', | |
| 972 | 975 | '<@(deps_files)', | |
| 976 | + '<@(linked_module_files)', | ||
| 973 | 977 | ], | |
| 974 | 978 | }, | |
| 975 | 979 | ], | |
0 commit comments