diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 19:33:51 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 19:33:51 +0000 |
| commit | 1e033489eba32dc824b3625a74d1c7f7521295dc (patch) | |
| tree | 7389a60e7cea548012fb78927e8549cb309f26fc /build | |
| parent | 3dcfa9c0cf8bc376faa2ec8cb3dc5ceaf153ece3 (diff) | |
| download | chromium_src-1e033489eba32dc824b3625a74d1c7f7521295dc.zip chromium_src-1e033489eba32dc824b3625a74d1c7f7521295dc.tar.gz chromium_src-1e033489eba32dc824b3625a74d1c7f7521295dc.tar.bz2 | |
Revert "Build fix: no gold on any ChromeOS build."
This reverts commit r121264, the bot is just sick.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index a4631b7..76614d4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -389,14 +389,18 @@ # linux_use_gold_binary: whether to use the binary checked into # third_party/gold. + ['host_arch=="x64"', { + 'linux_use_gold_binary%': 1, + }, { + 'linux_use_gold_binary%': 0, + }], + # linux_use_gold_flags: whether to use build flags that rely on gold. # On by default for x64 Linux. Temporarily off for ChromeOS as # it failed on a buildbot. ['host_arch=="x64" and chromeos==0', { - 'linux_use_gold_binary%': 1, 'linux_use_gold_flags%': 1, }, { - 'linux_use_gold_binary%': 0, 'linux_use_gold_flags%': 0, }], |