Skip to content

Commit

Permalink
build: make cctest work with --shared-openssl
Browse files Browse the repository at this point in the history
A new cctest added for v8_inspector was requiring the bundled openssl
unconditionally.

Fixes: #7478
Ref: #6792
  • Loading branch information
ofrobots committed Jun 29, 2016
1 parent c2e6078 commit 841b434
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,6 @@
'target_name': 'cctest',
'type': 'executable',
'dependencies': [
'deps/openssl/openssl.gyp:openssl',
'deps/http_parser/http_parser.gyp:http_parser',
'deps/gtest/gtest.gyp:gtest',
'deps/uv/uv.gyp:libuv',
Expand Down Expand Up @@ -742,14 +741,20 @@
'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'
]
}]
]
}]
]
}
Expand Down

0 comments on commit 841b434

Please sign in to comment.