From 4bbb5dc9781befdc6f2fd52ad2bcaa4afe3fd896 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 22 Jun 2023 10:45:46 -0400 Subject: [PATCH] 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. --- configure.py | 2 +- node.gyp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.py b/configure.py index fef5b87d74da2e..ee08264e91d8a4 100755 --- a/configure.py +++ b/configure.py @@ -1411,7 +1411,7 @@ def configure_node(o): o['variables']['shlib_suffix'] = shlib_suffix 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) diff --git a/node.gyp b/node.gyp index 218f1b834b108d..80e918591ccef7 100644 --- a/node.gyp +++ b/node.gyp @@ -27,6 +27,8 @@ 'node_lib_target_name%': 'libnode', 'node_intermediate_lib_type%': 'static_library', 'node_builtin_modules_path%': '', + 'linked_module_files': [ + ], # 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. # 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 'library_files': [ '<@(node_library_files)', + '<@(linked_module_files)', ], 'deps_files': [ 'deps/v8/tools/splaytree.mjs', @@ -954,6 +957,7 @@ 'lib', 'config.gypi', '<@(deps_files)', + '<@(linked_module_files)', ], }, ],