Skip to content

Commit df214ab

Browse files
authored
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 a5af644 commit df214ab

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
@@ -2198,7 +2198,7 @@ def configure_napi(output):
21982198
def configure_library(lib, output, pkgname=None, libraries_key='libraries'):
21992199
shared_lib = 'shared_' + lib
22002200
output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib))
2201-
libraries = output[libraries_key]
2201+
libraries = output[libraries_key] if libraries_key in output else output['variables'][libraries_key]
22022202

22032203
if getattr(options, shared_lib):
22042204
(pkg_libs, pkg_cflags, pkg_libpath, _) = pkg_config(pkgname or lib)
@@ -2968,7 +2968,7 @@ def make_bin_override():
29682968
configure_library('cares', output, pkgname='libcares')
29692969
# Only cctest uses gtest; keep it out of the node binary's link line.
29702970
output['variables']['node_shared_gtest_libraries'] = []
2971-
configure_library('gtest', output, 'node_shared_gtest_libraries')
2971+
configure_library('gtest', output, libraries_key='node_shared_gtest_libraries')
29722972
configure_library('hdr_histogram', output)
29732973
configure_library('highway', output, pkgname='libhwy')
29742974
configure_library('merve', output)

0 commit comments

Comments
 (0)