Skip to content

build: respect --shared-* flags for inspector deps #7569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChALkeR merged 1 commit into from
Jul 9, 2016
Merged

build: respect --shared-* flags for inspector deps #7569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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: #7478
Fixes: #7583
PR-URL: #7569
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
  • Loading branch information
@ChALkeR
ChALkeR committed Jul 9, 2016
commit 990c9683e929de9cb84793f14ee3ca39cb855d17
22 changes: 17 additions & 5 deletions node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"', {
Expand Down