From f80556d863e154dafe9b5a35a70f01b9c626263d Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Fri, 24 Sep 2010 00:03:28 +0000 Subject: Revert "linux: Build with -fPIC on all arches but x86 32-bit." This reverts commit r60384, build breakage. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60386 0039d316-1c4b-4281-b951-d872f2087c98 --- build/common.gypi | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'build') diff --git a/build/common.gypi b/build/common.gypi index f2311a5..66294115 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -93,14 +93,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, - }], ], 'host_arch%': '<(host_arch)', @@ -122,6 +114,10 @@ # 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', @@ -158,7 +154,6 @@ '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)', -- cgit v1.1