Index: build/common.gypi |
=================================================================== |
--- build/common.gypi (revision 264750) |
+++ build/common.gypi (working copy) |
@@ -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. |
Lei Zhang
2014/04/18 06:42:40
The .ebuild controls this for full ChromeOS builds
|
- ['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, |
@@ -3796,10 +3795,7 @@ |
['linux_dump_symbols==1', { |
'cflags': [ '-g' ], |
'conditions': [ |
- # TODO(thestig) We should not need to specify chromeos==0 here, |
- # but somehow ChromeOS uses gold despite linux_use_bundled_gold==0. |
- # http://crbug.com./360082 |
- ['linux_use_bundled_gold==0 and chromeos==0 and OS!="android"', { |
+ ['linux_use_gold_flags==0 and OS!="android"', { |
'target_conditions': [ |
['_toolset=="target"', { |
'ldflags': [ |