Skip to content

build: fix gtest integration #66735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Oct 15, 2026
+2 −2
Merged

build: fix gtest integration #66735

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -2968,7 +2968,7 @@ def make_bin_override():
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)
Expand Down
Loading