@@ -2195,9 +2195,10 @@ def configure_napi(output):
21952195 version = getnapibuildversion .get_napi_version ()
21962196 output ['variables' ]['napi_build_version' ] = version
21972197
2198- def configure_library (lib , output , pkgname = None ):
2198+ 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 ]
22012202
22022203 if getattr (options , shared_lib ):
22032204 (pkg_libs , pkg_cflags , pkg_libpath , _ ) = pkg_config (pkgname or lib )
@@ -2216,17 +2217,17 @@ def configure_library(lib, output, pkgname=None):
22162217 output ['msvs_settings' ]['VCLinkerTool' ]['AdditionalOptions' ] += [
22172218 f"/LIBPATH:{ options .__dict__ [shared_lib + '_libpath' ]} " ]
22182219 else :
2219- output [ ' libraries' ] += [
2220+ libraries += [
22202221 f"-L{ options .__dict__ [shared_lib + '_libpath' ]} " ]
22212222 elif pkg_libpath :
2222- output [ ' libraries' ] += [pkg_libpath ]
2223+ libraries += [pkg_libpath ]
22232224
22242225 default_libs = getattr (options , shared_lib + '_libname' )
22252226
22262227 if default_libs :
2227- output [ ' libraries' ] += [f'-l{ l } ' for l in default_libs .split (',' )]
2228+ libraries += [f'-l{ l } ' for l in default_libs .split (',' )]
22282229 elif pkg_libs :
2229- output [ ' libraries' ] += pkg_libs .split ()
2230+ libraries += pkg_libs .split ()
22302231
22312232
22322233def configure_v8 (o , configs ):
@@ -2974,7 +2975,9 @@ def make_bin_override():
29742975configure_library ('simdutf' , output )
29752976configure_library ('brotli' , output , pkgname = ['libbrotlidec' , 'libbrotlienc' ])
29762977configure_library ('cares' , output , pkgname = 'libcares' )
2977- configure_library ('gtest' , output )
2978+ # Only cctest uses gtest; keep it out of the node binary's link line.
2979+ output ['variables' ]['node_shared_gtest_libraries' ] = []
2980+ configure_library ('gtest' , output , 'node_shared_gtest_libraries' )
29782981configure_library ('hdr_histogram' , output )
29792982configure_library ('highway' , output , pkgname = 'libhwy' )
29802983configure_library ('merve' , output )
0 commit comments