diff options
| author | Michaël Zasso <targos@protonmail.com> | 2017-02-21 14:10:34 +0100 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2017-02-22 15:57:33 +0100 |
| commit | 7c0c7baff33b54992c37effa8822d2560698ee98 (patch) | |
| tree | 82e09cb078dc7e1266d92c4d6729f2ba4258e5bf /deps | |
| parent | 00a2aa0af595464904e8ce0e0aea1b3e8513ac5c (diff) | |
| download | android-node-v8-7c0c7baff33b54992c37effa8822d2560698ee98.tar.gz android-node-v8-7c0c7baff33b54992c37effa8822d2560698ee98.tar.bz2 android-node-v8-7c0c7baff33b54992c37effa8822d2560698ee98.zip | |
deps: fix gyp configuration for v8-inspector
Cross-compiled builds need different toolsets.
PR-URL: https://github.com/nodejs/node/pull/10992
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/src/inspector/inspector.gyp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/deps/v8/src/inspector/inspector.gyp b/deps/v8/src/inspector/inspector.gyp index c70722f852..91507bd579 100644 --- a/deps/v8/src/inspector/inspector.gyp +++ b/deps/v8/src/inspector/inspector.gyp @@ -13,6 +13,13 @@ 'targets': [ { 'target_name': 'inspector_injected_script', 'type': 'none', + 'conditions': [ + ['want_separate_host_toolset==1', { + 'toolsets': ['host', 'target'], + }, { + 'toolsets': ['target'], + }] + ], 'actions': [ { 'action_name': 'convert_js_to_cpp_char_array', @@ -37,6 +44,13 @@ }, { 'target_name': 'inspector_debugger_script', 'type': 'none', + 'conditions': [ + ['want_separate_host_toolset==1', { + 'toolsets': ['host', 'target'], + }, { + 'toolsets': ['target'], + }] + ], 'actions': [ { 'action_name': 'convert_js_to_cpp_char_array', @@ -61,6 +75,13 @@ }, { 'target_name': 'protocol_compatibility', 'type': 'none', + 'conditions': [ + ['want_separate_host_toolset==1', { + 'toolsets': ['host', 'target'], + }, { + 'toolsets': ['target'], + }] + ], 'actions': [ { 'action_name': 'protocol_compatibility', @@ -83,6 +104,13 @@ { 'target_name': 'protocol_generated_sources', 'type': 'none', 'dependencies': [ 'protocol_compatibility' ], + 'conditions': [ + ['want_separate_host_toolset==1', { + 'toolsets': ['host', 'target'], + }, { + 'toolsets': ['target'], + }] + ], 'actions': [ { 'action_name': 'protocol_generated_sources', |