Skip to content

Commit

Permalink
build: don't build deps/zlib if --shared-zlib set
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gibfahn committed Jan 29, 2017
1 parent 1155ade commit ae21a51
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@
'HAVE_INSPECTOR=1',
],
'dependencies': [
'deps/zlib/zlib.gyp:zlib',
'v8_inspector_compress_protocol_json#host'
],
'include_dirs': [
Expand All @@ -921,6 +920,11 @@
'test/cctest/test_inspector_socket_server.cc'
],
'conditions': [
[ 'node_shared_zlib=="false"', {
'dependencies': [
'deps/zlib/zlib.gyp:zlib',
]
}],
[ 'node_shared_openssl=="false"', {
'dependencies': [
'deps/openssl/openssl.gyp:openssl'
Expand Down

0 comments on commit ae21a51

Please sign in to comment.