| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index faeefc6e4942d8da298b6fe6659540dd83182eea..e11cb5b000fe178a39247b00786b7dc0d06c8e10 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -104,10 +104,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',
|
|
|
| @@ -147,7 +143,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)',
|
| @@ -1088,7 +1083,7 @@
|
| }],
|
| ],
|
| }],
|
| - ['linux_fpic==1', {
|
| + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
|
| 'cflags': [
|
| '-fPIC',
|
| ],
|
| @@ -1120,12 +1115,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},
|
|
|