Commit df214abc5f6 for nodejs
commit df214abc5f66bb920056ab46991e843b8129e75f
Author: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu Oct 15 15:26:29 2026 +0200
build: fix gtest integration
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/66735
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
diff --git a/configure.py b/configure.py
index a3769ff2d87..fb742692f53 100755
--- a/configure.py
+++ b/configure.py
@@ -2198,7 +2198,7 @@ def configure_napi(output):
def configure_library(lib, output, pkgname=None, libraries_key='libraries'):
shared_lib = 'shared_' + lib
output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib))
- libraries = output[libraries_key]
+ libraries = output[libraries_key] if libraries_key in output else output['variables'][libraries_key]
if getattr(options, shared_lib):
(pkg_libs, pkg_cflags, pkg_libpath, _) = pkg_config(pkgname or lib)
@@ -2968,7 +2968,7 @@ configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
configure_library('cares', output, pkgname='libcares')
# Only cctest uses gtest; keep it out of the node binary's link line.
output['variables']['node_shared_gtest_libraries'] = []
-configure_library('gtest', output, 'node_shared_gtest_libraries')
+configure_library('gtest', output, libraries_key='node_shared_gtest_libraries')
configure_library('hdr_histogram', output)
configure_library('highway', output, pkgname='libhwy')
configure_library('merve', output)