Skip to content

Commit 1fc3f45

Browse files
committed
build: fix gtest integration
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #66735 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 65e7050 commit 1fc3f45

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎configure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,7 +1906,7 @@ def configure_napi(output):
19061906
def configure_library(lib, output, pkgname=None, libraries_key='libraries'):
19071907
shared_lib = 'shared_' + lib
19081908
output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib))
1909-
libraries = output[libraries_key]
1909+
libraries = output[libraries_key] if libraries_key in output else output['variables'][libraries_key]
19101910

19111911
if getattr(options, shared_lib):
19121912
(pkg_libs, pkg_cflags, pkg_libpath, _) = pkg_config(pkgname or lib)
@@ -2529,7 +2529,7 @@ def make_bin_override():
25292529
configure_library('cares', output, pkgname='libcares')
25302530
# Only cctest uses gtest; keep it out of the node binary's link line.
25312531
output['variables']['node_shared_gtest_libraries'] = []
2532-
configure_library('gtest', output, 'node_shared_gtest_libraries')
2532+
configure_library('gtest', output, libraries_key='node_shared_gtest_libraries')
25332533
configure_library('hdr_histogram', output)
25342534
configure_library('merve', output)
25352535
configure_library('nbytes', output)

0 commit comments

Comments
 (0)