Merge pull request #15 from libm/nw

Issue 224753002: Linux: Add yet another workaround to keep 32-bit linker...
hexiaoyuan · Jul 30, 2014 · 0e429ef · 0e429ef
2 parents 6f85038 + cd26d71
commit 0e429ef
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -3846,12 +3846,13 @@
           ['linux_dump_symbols==1', {
             'cflags': [ '-g' ],
             'conditions': [
-              ['target_arch=="ia32" and OS!="android"', {
+              ['linux_use_gold_flags==0 and OS!="android"', {
                 'target_conditions': [
                   ['_toolset=="target"', {
                     'ldflags': [
-                      # Workaround for linker OOM.
+                      # Workarounds for linker OOM.
                       '-Wl,--no-keep-memory',
+                      '-Wl,--reduce-memory-overheads',
                     ],
                   }],
                 ],