summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-04 02:58:39 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-04 02:58:39 +0000
commitb42248387bd575fa79e2de20d1d190720841ae1e (patch)
tree98c7f10e3a35667b814ab47e1a4c459c5318dd13
parent69e6199b7209baa145db49eeab069b7249edd150 (diff)
downloadchromium_src-b42248387bd575fa79e2de20d1d190720841ae1e.zip
chromium_src-b42248387bd575fa79e2de20d1d190720841ae1e.tar.gz
chromium_src-b42248387bd575fa79e2de20d1d190720841ae1e.tar.bz2
Revert 261632 "Linux: Add yet another workaround to keep 32-bit ..."
> Linux: Add yet another workaround to keep 32-bit linkers from going OOM. > > BUG=358546 > > Review URL: https://codereview.chromium.org/224753002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/225193002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261637 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 6740615..d094ed2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3806,13 +3806,12 @@
['linux_dump_symbols==1', {
'cflags': [ '-g' ],
'conditions': [
- ['linux_use_gold_flags==0 and OS!="android"', {
+ ['target_arch=="ia32" and OS!="android"', {
'target_conditions': [
['_toolset=="target"', {
'ldflags': [
- # Workarounds for linker OOM.
+ # Workaround for linker OOM.
'-Wl,--no-keep-memory',
- '-Wl,--reduce-memory-overheads',
],
}],
],