summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 22:01:49 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 22:01:49 +0000
commitfd6d17ca53337b4b96e4acb8c99019593e17c6c2 (patch)
tree600761545f5d7c49180db7f5270a6a546e0ef382
parent3919ee647976a4b20c2483d28b2aa33c5b2c21bb (diff)
downloadchromium_src-fd6d17ca53337b4b96e4acb8c99019593e17c6c2.zip
chromium_src-fd6d17ca53337b4b96e4acb8c99019593e17c6c2.tar.gz
chromium_src-fd6d17ca53337b4b96e4acb8c99019593e17c6c2.tar.bz2
Linux: Remove some ChromeOS linker flag workarounds now that full ChromeOS builds set the flags explicitly.
BUG=360082 Review URL: https://codereview.chromium.org/242453003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266970 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/common.gypi5
1 files changed, 2 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index cae5cbe..df2858e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -749,9 +749,8 @@
}],
# 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.
- ['OS=="linux" and target_arch=="x64" and chromeos==0', {
+ # On by default for x64 Linux.
+ ['OS=="linux" and target_arch=="x64"', {
'linux_use_gold_flags%': 1,
}, {
'linux_use_gold_flags%': 0,