From ff979e0df007968901ee49f2894fcdc1df781aab Mon Sep 17 00:00:00 2001 From: "nirnimesh@chromium.org" Date: Wed, 11 Aug 2010 19:14:50 +0000 Subject: Enable -fPIC by default on x64 Get rid of linux_fpic gyp variable. BUG=26625 TEST=all linux builds should compile Review URL: http://codereview.chromium.org/3135001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55766 0039d316-1c4b-4281-b951-d872f2087c98 --- build/common.gypi | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'build/common.gypi') diff --git a/build/common.gypi b/build/common.gypi index c27dc75..0617a5c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -111,10 +111,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,7 +150,6 @@ 'touchui%': '<(touchui)', 'inside_chromium_build%': '<(inside_chromium_build)', 'fastbuild%': '<(fastbuild)', - 'linux_fpic%': '<(linux_fpic)', 'python_ver%': '<(python_ver)', 'armv7%': '<(armv7)', 'arm_neon%': '<(arm_neon)', @@ -1087,7 +1082,7 @@ }], ], }], - ['linux_fpic==1', { + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { 'cflags': [ '-fPIC', ], @@ -1119,12 +1114,6 @@ # When building with shared libraries, remove the visiblity-hiding # flag. 'cflags!': [ '-fvisibility=hidden' ], - 'conditions': [ - ['target_arch=="x64" or target_arch=="arm"', { - # Shared libraries need -fPIC on x86-64 and arm - 'cflags': ['-fPIC'] - }] - ], }], ['linux_use_heapchecker==1', { 'variables': {'linux_use_tcmalloc%': 1}, -- cgit v1.1