Skip to content

Commit ae21a51

Browse files
committed
build: don't build deps/zlib if --shared-zlib set
Even if the --shared-zlib flag was used, the bundled deps/zlib was still being compiled into the binary as it was required by the C++ test suite. PR-URL: #10657 Fixes: #10649 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent 1155ade commit ae21a51

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

node.gyp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,6 @@
908908
'HAVE_INSPECTOR=1',
909909
],
910910
'dependencies': [
911-
'deps/zlib/zlib.gyp:zlib',
912911
'v8_inspector_compress_protocol_json#host'
913912
],
914913
'include_dirs': [
@@ -921,6 +920,11 @@
921920
'test/cctest/test_inspector_socket_server.cc'
922921
],
923922
'conditions': [
923+
[ 'node_shared_zlib=="false"', {
924+
'dependencies': [
925+
'deps/zlib/zlib.gyp:zlib',
926+
]
927+
}],
924928
[ 'node_shared_openssl=="false"', {
925929
'dependencies': [
926930
'deps/openssl/openssl.gyp:openssl'

0 commit comments

Comments
 (0)