Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
build: merged conditions for v8_inspector
Browse files Browse the repository at this point in the history
After recent sync to nodejs/master there were 2 conditions
section for cctest. Merged those sections. Thanks @jianchun
for pointing it out.

PR-URL: #80
Reviewed-By: Jianchun Xu <Jianchun.Xu@microsoft.com>
  • Loading branch information
kunalspathak committed Jun 20, 2016
1 parent f2ad532 commit 89dbaf8
Showing 1 changed file with 12 additions and 15 deletions.
27 changes: 12 additions & 15 deletions node.gyp
Expand Up @@ -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',
Expand Down Expand Up @@ -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': {
Expand All @@ -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

Expand Down

0 comments on commit 89dbaf8

Please sign in to comment.