Permalink
Browse files

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 <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
  • Loading branch information...
targos committed Mar 17, 2017
1 parent 3471d63 commit 8394b05e20d3b661bb36cf778cd1f8c323334d7d
Showing with 28 additions and 2 deletions.
  1. +0 −2 deps/v8/gypfiles/toolchain.gypi
  2. +28 −0 deps/v8/src/inspector/inspector.gyp
@@ -989,8 +989,6 @@
# present in VS 2003 and earlier.
'msvs_disabled_warnings': [4351],
'msvs_configuration_attributes': {
'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)',
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
'CharacterSet': '1',
},
}],
@@ -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',

0 comments on commit 8394b05

Please sign in to comment.