summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_exe.gypi
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 00:43:53 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 00:43:53 +0000
commit16d71b0d8a772c8942be721f555081cead91f831 (patch)
treefebbb809fa7b92532cdcfacbe817b831ba4c3d97 /chrome/chrome_exe.gypi
parentd36ccf511ffb7b57f004acf56f87c318602502a5 (diff)
downloadchromium_src-16d71b0d8a772c8942be721f555081cead91f831.zip
chromium_src-16d71b0d8a772c8942be721f555081cead91f831.tar.gz
chromium_src-16d71b0d8a772c8942be721f555081cead91f831.tar.bz2
Trying to make the -pie stick for x64 on the main waterfall...
TBR=jeffbailey Review URL: http://codereview.chromium.org/7206052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
-rw-r--r--chrome/chrome_exe.gypi18
1 files changed, 14 insertions, 4 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index d336894..75695d6 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -194,11 +194,21 @@
],
},
],
- # TODO(rkc): Remove this once we have a fix for remote gdb
- # and are able to correctly get section header offsets for
- # pie executables. Currently -pie breaks remote debugging.
+ # TODO(rkc): Remove disable_pie (and instead always use
+ # -pie) once we have a fix for remote gdb and are able to
+ # correctly get section header offsets for pie
+ # executables. Currently -pie breaks remote debugging.
['disable_pie==1', {
- 'ldflags' : ['-nopie'],
+ 'ldflags': ['-nopie'],
+ }, {
+ # Building with -fPIE fails on ARM and ia32 bots.
+ # http://code.google.com/p/chromium/issues/detail?id=57908
+ # Until that is fixed, at least use it on Linux 64-bit.
+ 'conditions': [
+ ['target_arch=="x64"', {
+ 'ldflags': ['-pie'],
+ }],
+ ],
}],
['use_system_xdg_utils==0', {
'copies': [