diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi index 9c8f4a29012e32..88afb8612e4be9 100644 --- a/deps/v8/gypfiles/toolchain.gypi +++ b/deps/v8/gypfiles/toolchain.gypi @@ -991,8 +991,6 @@ # present in VS 2003 and earlier. 'msvs_disabled_warnings': [4351], 'msvs_configuration_attributes': { - 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', - 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 'CharacterSet': '1', }, }], diff --git a/deps/v8/src/inspector/inspector.gyp b/deps/v8/src/inspector/inspector.gyp index c70722f852b608..91507bd579f798 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',