mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-30 16:10:36 +00:00
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From https://github.com/nodejs/node/pull/66735
|
|
|
|
diff --git a/configure.py b/configure.py
|
|
index a3769ff2d87..fb742692f53 100755
|
|
--- a/configure.py
|
|
+++ b/configure.py
|
|
@@ -2198,7 +2198,7 @@ def configure_napi(output):
|
|
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]
|
|
+ libraries = output[libraries_key] if libraries_key in output else output['variables'][libraries_key]
|
|
|
|
if getattr(options, shared_lib):
|
|
(pkg_libs, pkg_cflags, pkg_libpath, _) = pkg_config(pkgname or lib)
|
|
@@ -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, 'node_shared_gtest_libraries')
|
|
+configure_library('gtest', output, libraries_key='node_shared_gtest_libraries')
|
|
configure_library('hdr_histogram', output)
|
|
configure_library('highway', output, pkgname='libhwy')
|
|
configure_library('merve', output)
|