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 /gpu | |
| 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 'gpu')
| -rw-r--r-- | gpu/demos/demos.gyp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index a7ba2b9..02a4d50 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -6,15 +6,10 @@ 'variables': { 'chromium_code': 1, 'conditions': [ - # Pepper demos that are compiled as shared libraries need to be compiled - # with -fPIC flag. All static libraries that these demos depend on must - # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1" - # compiles everything with -fPIC. Disable pepper demos on linux/x64 - # unless linux_fpic is 1. - ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { - 'enable_pepper_demos%': 0, - }, { + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { 'enable_pepper_demos%': 1, + }, { + 'enable_pepper_demos%': 0, }], ], }, |