diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 19:14:50 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 19:14:50 +0000 |
| commit | ff979e0df007968901ee49f2894fcdc1df781aab (patch) | |
| tree | 678202ada3a434d11658d9f5ef93b11895337fe7 /build | |
| parent | 7745d5a28e940216257b46d1db9cad0c83c24a48 (diff) | |
| download | chromium_src-ff979e0df007968901ee49f2894fcdc1df781aab.zip chromium_src-ff979e0df007968901ee49f2894fcdc1df781aab.tar.gz chromium_src-ff979e0df007968901ee49f2894fcdc1df781aab.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 13 |
1 files changed, 1 insertions, 12 deletions
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}, |