diff options
| -rw-r--r-- | build/common.gypi | 12 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8d70646..75eed9b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -145,6 +145,10 @@ # Has no effect if 'clang' is not set as well. 'clang_use_chrome_plugins%': 0, + # Set to 1 compile with -fPIC cflag on linux. This is a must for shared + # libraries on linux x86-64 and arm, plus ASLR. + 'linux_fpic%': 1, + 'conditions': [ # Use Skia as WebKit renderer on Mac ['OS=="mac"', { @@ -179,14 +183,6 @@ 'use_gnome_keyring%': 1, }], - # Set to 1 compile with -fPIC cflag on linux. This is a must for shared - # libraries on linux x86-64 and arm. - ['host_arch=="ia32"', { - 'linux_fpic%': 0, - }, { - 'linux_fpic%': 1, - }], - ['toolkit_views==0 or OS=="mac"', { # GTK+ and Mac wants Title Case strings 'use_titlecase_in_grd_files%': 1, diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index d7a1723..238779f 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -200,11 +200,10 @@ ['disable_pie==1', { '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. + # Building with -pie needs investigating on ARM. + # For now, at least use it on Linux Intel. 'conditions': [ - ['target_arch=="x64"', { + ['target_arch=="x64" or target_arch=="ia32"', { 'ldflags': ['-pie'], }], ], |