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: nodejs#10657 Fixes: nodejs#10649 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
gibfahn · Jan 29, 2017 · ae21a51 · ae21a51
1 parent 1155ade
commit ae21a51
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/node.gyp b/node.gyp
@@ -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'