summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2015-09-14 13:18:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-14 20:19:29 +0000
commitcc2490a2986d70a393c04b6f69e52e82514bc9b7 (patch)
tree3c551edbaeed2d8b7c86559af6a63fe87c20e5d6 /build
parentf5865160d7a1ecdc8a855421a672c74a710dadf8 (diff)
downloadchromium_src-cc2490a2986d70a393c04b6f69e52e82514bc9b7.zip
chromium_src-cc2490a2986d70a393c04b6f69e52e82514bc9b7.tar.gz
chromium_src-cc2490a2986d70a393c04b6f69e52e82514bc9b7.tar.bz2
Use gold for linking on both 32-bit and 64-bit linux GN builds.
R=brettw@chromium.org, thestig@chromium.org BUG=432959 Review URL: https://codereview.chromium.org/1338893002 Cr-Commit-Position: refs/heads/master@{#348703}
Diffstat (limited to 'build')
-rw-r--r--build/config/compiler/BUILD.gn6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 1a7df30..3291731 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -44,9 +44,9 @@ declare_args() {
# Requires profiling to be set to true.
enable_full_stack_frames_for_profiling = false
- # Use gold for linking on 64-bit Linux only (on 32-bit it runs out of
- # address space, and it doesn't support cross-compiling).
- use_gold = is_linux && current_cpu == "x64"
+ # Use 64-bit gold for linking on both 64-bit Linux and 32-bit linux;
+ # 32-bit Gold runs out of address-space on 32-bit bit builds.
+ use_gold = is_linux && (current_cpu == "x64" || current_cpu == "x86")
# When we are going to use gold we need to find it.
if (use_gold) {