Skip to content

build: do not include shared gtest in node link path #66626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aduh95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: do not include shared gtest in node link path #66626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2195,9 +2195,10 @@ def configure_napi(output):
version = getnapibuildversion.get_napi_version()
output['variables']['napi_build_version'] = version

def configure_library(lib, output, pkgname=None):
def configure_library(lib, output, pkgname=None, libraries_key='libraries'):
shared_lib = 'shared_' + lib
output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib))
libraries = output[libraries_key]

if getattr(options, shared_lib):
(pkg_libs, pkg_cflags, pkg_libpath, _) = pkg_config(pkgname or lib)
Expand All @@ -2216,17 +2217,17 @@ def configure_library(lib, output, pkgname=None):
output['msvs_settings']['VCLinkerTool']['AdditionalOptions'] += [
f"/LIBPATH:{options.__dict__[shared_lib + '_libpath']}"]
else:
output['libraries'] += [
libraries += [
f"-L{options.__dict__[shared_lib + '_libpath']}"]
elif pkg_libpath:
output['libraries'] += [pkg_libpath]
libraries += [pkg_libpath]

default_libs = getattr(options, shared_lib + '_libname')

if default_libs:
output['libraries'] += [f'-l{l}' for l in default_libs.split(',')]
libraries += [f'-l{l}' for l in default_libs.split(',')]
elif pkg_libs:
output['libraries'] += pkg_libs.split()
libraries += pkg_libs.split()


def configure_v8(o, configs):
Expand Down Expand Up @@ -2974,7 +2975,9 @@ def make_bin_override():
configure_library('simdutf', output)
configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
configure_library('cares', output, pkgname='libcares')
configure_library('gtest', output)
# Only cctest uses gtest; keep it out of the node binary's link line.
output['variables']['node_shared_gtest_libraries'] = []
configure_library('gtest', output, 'node_shared_gtest_libraries')
configure_library('hdr_histogram', output)
configure_library('highway', output, pkgname='libhwy')
configure_library('merve', output)
Expand Down
3 changes: 2 additions & 1 deletion node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
'node_shared_brotli%': 'false',
'node_shared_cares%': 'false',
'node_shared_gtest%': 'false',
'node_shared_gtest_libraries%': [],
'node_shared_hdr_histogram%': 'false',
'node_shared_highway%': 'false',
'node_shared_http_parser%': 'false',
Expand Down Expand Up @@ -1387,7 +1388,7 @@
],
}],
[ 'node_shared_gtest=="true"', {
'libraries': [ '-lgtest_main' ],
'libraries': [ '-lgtest_main', '<@(node_shared_gtest_libraries)' ],
}],
[ 'node_use_bundled_v8!="false" and node_shared_abseil=="false"', {
'dependencies': [ 'tools/v8_gypfiles/abseil.gyp:abseil' ],
Expand Down
Loading