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 /chrome/chrome_tests.gypi | |
| 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 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index e31a25b..b8f2142 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -480,10 +480,6 @@ 'test/nacl_security_tests/nacl_security_tests_win.cc', ], },], - # set fPIC for linux in case it isn't set. - ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { - 'cflags': ['-fPIC'], - },], ], }, { @@ -2474,10 +2470,8 @@ }, ]}, # 'targets' ], # OS=="win" - # Build on linux x86_64 only if linux_fpic==1 ['OS=="mac" or (OS=="win" and component=="static_library") ' - 'or (OS=="linux" and target_arch==python_arch ' - 'and (target_arch!="x64" or linux_fpic==1))', { + 'or (OS=="linux" and target_arch==python_arch)', { 'targets': [ { # Documentation: http://dev.chromium.org/developers/pyauto |