summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 18:56:11 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 18:56:11 +0000
commit0afe5211e641a8b1560adfceb42353206b011442 (patch)
tree13d0f7f8dc4411988535dbe522a9e53d66b28190 /build
parent82d1aa79da82416347341b56fd3e372a2857fe77 (diff)
downloadchromium_src-0afe5211e641a8b1560adfceb42353206b011442.zip
chromium_src-0afe5211e641a8b1560adfceb42353206b011442.tar.gz
chromium_src-0afe5211e641a8b1560adfceb42353206b011442.tar.bz2
linux: Build with -fPIC on all arches but x86 32-bit.
I will watch the bots to see if this affects performance. BUG=26625 TEST=compiles Review URL: http://codereview.chromium.org/3501001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi16
1 files changed, 10 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 1665600..79995f2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -93,6 +93,14 @@
}, {
'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,
+ }],
],
'host_arch%': '<(host_arch)',
@@ -101,7 +109,7 @@
# building on.
'target_arch%': '<(host_arch)',
- # Copy conditionally-set chromeos and touchui variables out one scope.
+ # Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
@@ -114,10 +122,6 @@
# compilation.
'fastbuild%': 0,
- # Set to 1 compile with -fPIC cflag on linux. This is a must for shared
- # libraries on linux x86-64 and arm.
- 'linux_fpic%': 0,
-
# Python version.
'python_ver%': '2.5',
@@ -154,11 +158,11 @@
'host_arch%': '<(host_arch)',
'toolkit_views%': '<(toolkit_views)',
'use_gnome_keyring%': '<(use_gnome_keyring)',
+ 'linux_fpic%': '<(linux_fpic)',
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
'inside_chromium_build%': '<(inside_chromium_build)',
'fastbuild%': '<(fastbuild)',
- 'linux_fpic%': '<(linux_fpic)',
'python_ver%': '<(python_ver)',
'armv7%': '<(armv7)',
'arm_neon%': '<(arm_neon)',