Skip to content

Commit 8394b05

Browse files
committed
deps: cherry-pick c5c570f from upstream V8
Original commit message: [build] Fix gyp files for building inspector This patch fixes compilation of V8 with inspector on Windows as well as cross-compilation of the V8 inspector. BUG= Refs: #10992 Review-Url: https://codereview.chromium.org/2705423003 Cr-Commit-Position: refs/heads/master@{#43533} PR-URL: #11752 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]>
1 parent 3471d63 commit 8394b05

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

deps/v8/gypfiles/toolchain.gypi

-2
Original file line numberDiff line numberDiff line change
@@ -989,8 +989,6 @@
989989
# present in VS 2003 and earlier.
990990
'msvs_disabled_warnings': [4351],
991991
'msvs_configuration_attributes': {
992-
'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)',
993-
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
994992
'CharacterSet': '1',
995993
},
996994
}],

deps/v8/src/inspector/inspector.gyp

+28
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
'targets': [
1414
{ 'target_name': 'inspector_injected_script',
1515
'type': 'none',
16+
'conditions': [
17+
['want_separate_host_toolset==1', {
18+
'toolsets': ['host', 'target'],
19+
}, {
20+
'toolsets': ['target'],
21+
}]
22+
],
1623
'actions': [
1724
{
1825
'action_name': 'convert_js_to_cpp_char_array',
@@ -37,6 +44,13 @@
3744
},
3845
{ 'target_name': 'inspector_debugger_script',
3946
'type': 'none',
47+
'conditions': [
48+
['want_separate_host_toolset==1', {
49+
'toolsets': ['host', 'target'],
50+
}, {
51+
'toolsets': ['target'],
52+
}]
53+
],
4054
'actions': [
4155
{
4256
'action_name': 'convert_js_to_cpp_char_array',
@@ -61,6 +75,13 @@
6175
},
6276
{ 'target_name': 'protocol_compatibility',
6377
'type': 'none',
78+
'conditions': [
79+
['want_separate_host_toolset==1', {
80+
'toolsets': ['host', 'target'],
81+
}, {
82+
'toolsets': ['target'],
83+
}]
84+
],
6485
'actions': [
6586
{
6687
'action_name': 'protocol_compatibility',
@@ -83,6 +104,13 @@
83104
{ 'target_name': 'protocol_generated_sources',
84105
'type': 'none',
85106
'dependencies': [ 'protocol_compatibility' ],
107+
'conditions': [
108+
['want_separate_host_toolset==1', {
109+
'toolsets': ['host', 'target'],
110+
}, {
111+
'toolsets': ['target'],
112+
}]
113+
],
86114
'actions': [
87115
{
88116
'action_name': 'protocol_generated_sources',

0 commit comments

Comments
 (0)