Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: gpu/demos/demos.gyp

Issue 3150006: Revert 55766 - Enable -fPIC by default on x64... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/demos/demos.gyp
===================================================================
--- gpu/demos/demos.gyp (revision 55834)
+++ gpu/demos/demos.gyp (working copy)
@@ -6,10 +6,15 @@
'variables': {
'chromium_code': 1,
'conditions': [
- ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
+ # 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,
- }, {
- 'enable_pepper_demos%': 0,
}],
],
},
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698