diff options
| author | sbc <sbc@chromium.org> | 2015-04-17 10:23:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 17:24:10 +0000 |
| commit | fe4acac6ff5547d7674e6681c9b556528520fdf7 (patch) | |
| tree | 899eb1e255dcd671a8227d732444d8901ce6e387 | |
| parent | 711f2fc883c05bb10466fb65fdaf9bc10c909b23 (diff) | |
| download | chromium_src-fe4acac6ff5547d7674e6681c9b556528520fdf7.zip chromium_src-fe4acac6ff5547d7674e6681c9b556528520fdf7.tar.gz chromium_src-fe4acac6ff5547d7674e6681c9b556528520fdf7.tar.bz2 | |
Always build dump_syms with the 'host' toolchain
A recent change set linux_dump_symbols=1 on the trybots
and was then reverted:
https://codereview.chromium.org/1081103005
The causes the ARM/Linux builder to fail since it was
attempting to run the target (ARM) dump_syms binary on
x86. This change makes dump_syms a host binary so that
it can run at build time.
BUG=476781
TEST=linux_arm_compile trybot
Review URL: https://codereview.chromium.org/1061473003
Cr-Commit-Position: refs/heads/master@{#325661}
| -rw-r--r-- | breakpad/breakpad.gyp | 6 | ||||
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/gn_migration.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index de0faac..cc5187d 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -447,11 +447,7 @@ # GN version: //breakpad:dump_syms 'target_name': 'dump_syms', 'type': 'executable', - 'conditions': [ - ['OS=="android"', { - 'toolsets': [ 'host' ], - }], - ], + 'toolsets': ['host'], # dwarf2reader.cc uses dynamic_cast. Because we don't typically # don't support RTTI, we enable it for this single target. Since diff --git a/build/all.gyp b/build/all.gyp index 40a7e29..13ae2a4 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -538,7 +538,7 @@ }], ['OS=="linux"', { 'dependencies': [ - '../breakpad/breakpad.gyp:dump_syms', + '../breakpad/breakpad.gyp:dump_syms#host', ], }], ], diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index ad6560c..9aa30af 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -378,7 +378,7 @@ ['OS=="linux"', { 'dependencies': [ '../breakpad/breakpad.gyp:breakpad_unittests', - '../breakpad/breakpad.gyp:dump_syms', + '../breakpad/breakpad.gyp:dump_syms#host', '../breakpad/breakpad.gyp:generate_test_dump', '../breakpad/breakpad.gyp:minidump-2-core', '../dbus/dbus.gyp:dbus_test_server', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 5137c93..55d9dce 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -383,7 +383,7 @@ ], 'dependencies': [ 'chrome', - '../breakpad/breakpad.gyp:dump_syms', + '../breakpad/breakpad.gyp:dump_syms#host', ], }], ], |