Commit 933ff62
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>1 parent 8e50413 commit 933ff62
1 file changed
Lines changed: 17 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -830,14 +830,26 @@ | |||
| 830 | 830 | ||
| 831 | 831 | 'conditions': [ | |
| 832 | 832 | ['v8_inspector=="true"', { | |
| 833 | - 'dependencies': [ | ||
| 834 | - 'deps/openssl/openssl.gyp:openssl', | ||
| 835 | - 'deps/http_parser/http_parser.gyp:http_parser', | ||
| 836 | - 'deps/uv/uv.gyp:libuv' | ||
| 837 | - ], | ||
| 838 | 833 | 'sources': [ | |
| 839 | 834 | 'src/inspector_socket.cc', | |
| 840 | 835 | 'test/cctest/test_inspector_socket.cc' | |
| 836 | + ], | ||
| 837 | + 'conditions': [ | ||
| 838 | + [ 'node_shared_openssl=="false"', { | ||
| 839 | + 'dependencies': [ | ||
| 840 | + 'deps/openssl/openssl.gyp:openssl' | ||
| 841 | + ] | ||
| 842 | + }], | ||
| 843 | + [ 'node_shared_http_parser=="false"', { | ||
| 844 | + 'dependencies': [ | ||
| 845 | + 'deps/http_parser/http_parser.gyp:http_parser' | ||
| 846 | + ] | ||
| 847 | + }], | ||
| 848 | + [ 'node_shared_libuv=="false"', { | ||
| 849 | + 'dependencies': [ | ||
| 850 | + 'deps/uv/uv.gyp:libuv' | ||
| 851 | + ] | ||
| 852 | + }] | ||
| 841 | 853 | ] | |
| 842 | 854 | }], | |
| 843 | 855 | [ 'node_use_v8_platform=="true"', { | |
0 commit comments