diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 03:15:13 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 03:15:13 +0000 |
| commit | 1ad5a7b2a5b605005e997cb89b4f8bdc1011d2b2 (patch) | |
| tree | fe5b579008be83db7eb237b09ae437d9de486885 /build | |
| parent | 5696b83d30a6edace89241c7c9ed28387b072a85 (diff) | |
| download | chromium_src-1ad5a7b2a5b605005e997cb89b4f8bdc1011d2b2.zip chromium_src-1ad5a7b2a5b605005e997cb89b4f8bdc1011d2b2.tar.gz chromium_src-1ad5a7b2a5b605005e997cb89b4f8bdc1011d2b2.tar.bz2 | |
Now try and make -pie stick for 32-bit Linux too.
TBR=jeffbailey
Review URL: http://codereview.chromium.org/7240019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 12 |
1 files changed, 4 insertions, 8 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, |