Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Unified Diff: build/common.gypi

Issue 897163002: Always use the 64 bit linker on Linux 32 bit builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 948dcece70dcd3ca0944135682591ff6440b9054..e664be744aa4181cd1eb85c1ba128729d16359f5 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1588,6 +1588,12 @@
'sysroot%': '<(sysroot)',
'CXX%': '<(CXX)',
}],
+ # Use a 64-bit linker to avoid running out of address space. The
+ # buildbots should have a 64-bit kernel and a 64-bit libc installed.
+ ['host_arch=="ia32" and target_arch=="ia32"', {
+ 'linux_use_bundled_gold%': '1',
+ 'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin',
+ }],
# All Chrome builds have breakpad symbols, but only process the
# symbols from official builds.
['(branding=="Chrome" and buildtype=="Official")', {
@@ -1596,16 +1602,6 @@
# Omit unwind support in official release builds to save space. We
# can use breakpad for these builds.
'release_unwind_tables%': 0,
-
- 'conditions': [
- # For official builds, use a 64-bit linker to avoid running out
- # of address space. The buildbots should have a 64-bit kernel
- # and a 64-bit libc installed.
- ['host_arch=="ia32" and target_arch=="ia32"', {
- 'linux_use_bundled_gold%': '1',
- 'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin',
- }],
- ],
}],
],
}], # os_posix==1 and OS!="mac" and OS!="ios"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698