From 9c2f686f7ec04646d0b41d115ebfa044d611f260 Mon Sep 17 00:00:00 2001 From: Gibson Fahnestock Date: Fri, 6 Jan 2017 10:00:41 +0000 Subject: [PATCH] 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 Reviewed-By: Ben Noordhuis --- node.gyp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/node.gyp b/node.gyp index 1cb2497296a7ea..3fa9277d859ea8 100644 --- a/node.gyp +++ b/node.gyp @@ -900,7 +900,6 @@ 'HAVE_INSPECTOR=1', ], 'dependencies': [ - 'deps/zlib/zlib.gyp:zlib', 'v8_inspector_compress_protocol_json#host' ], 'include_dirs': [ @@ -913,6 +912,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'