From 89dbaf8851fffb8332d986c0efd48c91e00c66fd Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Fri, 17 Jun 2016 09:08:18 -0700 Subject: [PATCH] build: merged conditions for v8_inspector After recent sync to nodejs/master there were 2 conditions section for cctest. Merged those sections. Thanks @jianchun for pointing it out. PR-URL: nodejs/node-chakracore#80 Reviewed-By: Jianchun Xu --- node.gyp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/node.gyp b/node.gyp index ea8f081121b..7fc9557928f 100644 --- a/node.gyp +++ b/node.gyp @@ -248,7 +248,7 @@ 'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune' ], }], - [ 'v8_inspector=="true"', { + [ 'v8_inspector=="true" and node_engine=="v8"', { 'defines': [ 'HAVE_INSPECTOR=1', 'V8_INSPECTOR_USE_STL=1', @@ -751,6 +751,17 @@ 'deps/uv/uv.gyp:libuv' ], }], + [ 'v8_inspector=="true" and node_engine=="v8"', { + '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' + ] + }] ], 'msvs_settings': { 'VCLinkerTool': { @@ -770,20 +781,6 @@ 'sources': [ 'test/cctest/util.cc', ], - - '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' - ] - }] - ] } ], # end targets