Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
shared_optgroup.add_argument('--shared-gtest-libname',
action='store',
dest='shared_gtest_libname',
default='gtest',
default=None,
Comment thread
aduh95 marked this conversation as resolved.
Resolved
help='alternative lib name to link to [default: %(default)s]')

shared_optgroup.add_argument('--shared-gtest-libpath',
Expand Down Expand Up @@ -2968,7 +2968,7 @@ def make_bin_override():
configure_library('cares', output, pkgname='libcares')
# Only cctest uses gtest; keep it out of the node binary's link line.
output['variables']['node_shared_gtest_libraries'] = []
configure_library('gtest', output, libraries_key='node_shared_gtest_libraries')
configure_library('gtest', output, ['gtest_main', 'gtest'], 'node_shared_gtest_libraries')
configure_library('hdr_histogram', output)
configure_library('highway', output, pkgname='libhwy')
configure_library('merve', output)
Expand Down
2 changes: 1 addition & 1 deletion node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,7 @@
],
}],
[ 'node_shared_gtest=="true"', {
'libraries': [ '-lgtest_main', '<@(node_shared_gtest_libraries)' ],
'libraries': [ '<@(node_shared_gtest_libraries)' ],
}],
[ 'node_use_bundled_v8!="false" and node_shared_abseil=="false"', {
'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
Expand Down
Loading