diff options
author | Gibson Fahnestock <gib@uk.ibm.com> | 2017-01-06 13:00:41 +0300 |
---|---|---|
committer | Gibson Fahnestock <gib@uk.ibm.com> | 2017-01-30 01:37:38 +0300 |
commit | ae21a51154d5e2b909e3e770767c6aa92ecc105d (patch) | |
tree | ee5e2d4871c21aad4c17538ac1f1191a59ef63ae /node.gyp | |
parent | 1155ade002423eb62044598e13bf52a68f3330e5 (diff) |
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: https://github.com/nodejs/node/pull/10657
Fixes: https://github.com/nodejs/node/issues/10649
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'node.gyp')
-rw-r--r-- | node.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -908,7 +908,6 @@ 'HAVE_INSPECTOR=1', ], 'dependencies': [ - 'deps/zlib/zlib.gyp:zlib', 'v8_inspector_compress_protocol_json#host' ], 'include_dirs': [ @@ -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' |