| Index: chrome/chrome_exe.gypi
|
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
|
| index a2f0a4991d348ee8a9380a8c896ddc0438f2b96e..bcdf7e6c1b209379062008ee457d70c7b9d18381 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 other platforms.
|
| + 'conditions': [
|
| + ['target_arch!="arm" and target_arch!="ia32"', {
|
| + 'ldflags': ['-pie'],
|
| + }],
|
| + ],
|
| }],
|
| ['use_system_xdg_utils==0', {
|
| 'copies': [
|
|
|