Skip to content

Commit 18e4a90

Browse files
committed
build: load gtest_main using pkg-config
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent a0a4750 commit 18e4a90

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎configure.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
shared_optgroup.add_argument('--shared-gtest-libname',
320320
action='store',
321321
dest='shared_gtest_libname',
322-
default='gtest',
322+
default=None,
323323
help='alternative lib name to link to [default: %(default)s]')
324324

325325
shared_optgroup.add_argument('--shared-gtest-libpath',
@@ -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)
@@ -2977,7 +2977,7 @@ def make_bin_override():
29772977
configure_library('cares', output, pkgname='libcares')
29782978
# Only cctest uses gtest; keep it out of the node binary's link line.
29792979
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')
29812981
configure_library('hdr_histogram', output)
29822982
configure_library('highway', output, pkgname='libhwy')
29832983
configure_library('merve', output)

‎node.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@
13881388
],
13891389
}],
13901390
[ 'node_shared_gtest=="true"', {
1391-
'libraries': [ '-lgtest_main', '<@(node_shared_gtest_libraries)' ],
1391+
'libraries': [ '<@(node_shared_gtest_libraries)' ],
13921392
}],
13931393
[ 'node_use_bundled_v8!="false" and node_shared_abseil=="false"', {
13941394
'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],

0 commit comments

Comments
 (0)