From 990c9683e929de9cb84793f14ee3ca39cb855d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BA=D0=BE=D0=B2=D0=BE=D1=80=D0=BE=D0=B4=D0=B0=20?= =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=90=D0=BD=D0=B4=D1=80?= =?UTF-8?q?=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?= Date: Wed, 6 Jul 2016 23:16:35 +0300 Subject: [PATCH] build: respect --shared-* flags for inspector deps Don't build openssl/http_parser/libuv for v8_inspector if corresponding --shared-* flags were passed to the ./configure script. Fixes: https://github.com/nodejs/node/issues/7478 Fixes: https://github.com/nodejs/node/issues/7583 PR-URL: https://github.com/nodejs/node/pull/7569 Reviewed-By: Ben Noordhuis Reviewed-By: Ali Ijaz Sheikh --- node.gyp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/node.gyp b/node.gyp index a1a5284292a7aa..f84de3906af12c 100644 --- a/node.gyp +++ b/node.gyp @@ -826,14 +826,26 @@ 'conditions': [ ['v8_inspector=="true"', { - 'dependencies': [ - 'deps/openssl/openssl.gyp:openssl', - 'deps/http_parser/http_parser.gyp:http_parser', - 'deps/uv/uv.gyp:libuv' - ], 'sources': [ 'src/inspector_socket.cc', 'test/cctest/test_inspector_socket.cc' + ], + 'conditions': [ + [ 'node_shared_openssl=="false"', { + 'dependencies': [ + 'deps/openssl/openssl.gyp:openssl' + ] + }], + [ 'node_shared_http_parser=="false"', { + 'dependencies': [ + 'deps/http_parser/http_parser.gyp:http_parser' + ] + }], + [ 'node_shared_libuv=="false"', { + 'dependencies': [ + 'deps/uv/uv.gyp:libuv' + ] + }] ] }], [ 'node_use_v8_platform=="true"', {