Skip to content

Commit 841b434

Browse files
committed
build: make cctest work with --shared-openssl
A new cctest added for v8_inspector was requiring the bundled openssl unconditionally. Fixes: nodejs#7478 Ref: nodejs#6792
1 parent c2e6078 commit 841b434

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

node.gyp

+8-3
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,6 @@
714714
'target_name': 'cctest',
715715
'type': 'executable',
716716
'dependencies': [
717-
'deps/openssl/openssl.gyp:openssl',
718717
'deps/http_parser/http_parser.gyp:http_parser',
719718
'deps/gtest/gtest.gyp:gtest',
720719
'deps/uv/uv.gyp:libuv',
@@ -742,14 +741,20 @@
742741
'conditions': [
743742
['v8_inspector=="true"', {
744743
'dependencies': [
745-
'deps/openssl/openssl.gyp:openssl',
746744
'deps/http_parser/http_parser.gyp:http_parser',
747745
'deps/uv/uv.gyp:libuv'
748746
],
749747
'sources': [
750748
'src/inspector_socket.cc',
751749
'test/cctest/test_inspector_socket.cc'
752-
]
750+
],
751+
'conditions': [
752+
[ 'node_shared_openssl=="false"', {
753+
'dependencies': [
754+
'deps/openssl/openssl.gyp:openssl'
755+
]
756+
}]
757+
]
753758
}]
754759
]
755760
}

0 commit comments

Comments
 (0)