|
319 | 319 | shared_optgroup.add_argument('--shared-gtest-libname', |
320 | 320 | action='store', |
321 | 321 | dest='shared_gtest_libname', |
322 | | - default='gtest', |
| 322 | + default=None, |
323 | 323 | help='alternative lib name to link to [default: %(default)s]') |
324 | 324 |
|
325 | 325 | shared_optgroup.add_argument('--shared-gtest-libpath', |
@@ -2198,7 +2198,7 @@ def configure_napi(output): |
2198 | 2198 | def configure_library(lib, output, pkgname=None, libraries_key='libraries'): |
2199 | 2199 | shared_lib = 'shared_' + lib |
2200 | 2200 | 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] |
2202 | 2202 |
|
2203 | 2203 | if getattr(options, shared_lib): |
2204 | 2204 | (pkg_libs, pkg_cflags, pkg_libpath, _) = pkg_config(pkgname or lib) |
@@ -2977,7 +2977,7 @@ def make_bin_override(): |
2977 | 2977 | configure_library('cares', output, pkgname='libcares') |
2978 | 2978 | # Only cctest uses gtest; keep it out of the node binary's link line. |
2979 | 2979 | output['variables']['node_shared_gtest_libraries'] = [] |
2980 | | -configure_library('gtest', output, 'node_shared_gtest_libraries') |
| 2980 | +configure_library('gtest', output, ['gtest_main', 'gtest'], 'node_shared_gtest_libraries') |
2981 | 2981 | configure_library('hdr_histogram', output) |
2982 | 2982 | configure_library('highway', output, pkgname='libhwy') |
2983 | 2983 | configure_library('merve', output) |
|
0 commit comments