From 2fb843bb0feb1e103caafd978e2cd1ae0fdf4658 Mon Sep 17 00:00:00 2001 From: "mirandac@chromium.org" Date: Thu, 12 Aug 2010 02:11:08 +0000 Subject: Revert 55766 - 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 TBR=nirnimesh@chromium.org Review URL: http://codereview.chromium.org/3150006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55836 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/demos/demos.gyp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gpu/demos') diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 02a4d50..a7ba2b9 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -6,10 +6,15 @@ 'variables': { 'chromium_code': 1, 'conditions': [ - ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { - 'enable_pepper_demos%': 1, - }, { + # 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, + }, { + 'enable_pepper_demos%': 1, }], ], }, -- cgit v1.1