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

Unified Diff: ppapi.gyp

Issue 3018003: Fix the -fvisibility=hidden settings to work with the linux shlib build.... (Closed) Base URL: http://ppapi.googlecode.com/svn/trunk/
Patch Set: '' Created 10 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi.gyp
===================================================================
--- ppapi.gyp (revision 163)
+++ ppapi.gyp (working copy)
@@ -6,6 +6,8 @@
{
'variables': {
'chromium_code': 1, # Use higher warning level.
+ },
+ 'target_defaults': {
'conditions': [
# Linux shared libraries should always be built -fPIC.
#
@@ -13,9 +15,12 @@
# into chrome, do we want to build w/o -fPIC? If so, how can we express
# that in the build system?
['OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris"', {
- 'use_fpic': 1,
- },{
- 'use_fpic': 0,
+ 'cflags': ['-fPIC', '-fvisibility=hidden'],
+
+ # This is needed to make the Linux shlib build happy. Without this,
+ # -fvisibility=hidden gets stripped by the exclusion in common.gypi
+ # that is triggered when a shared library build is specified.
+ 'cflags/': [['include', '^-fvisibility=hidden$']],
}],
],
},
@@ -139,9 +144,6 @@
},
},
}],
- ['use_fpic==1', {
- 'cflags': ['-fPIC'],
- }],
['OS=="linux"', {
'cflags': ['-Wextra', '-pedantic'],
}],
@@ -170,9 +172,6 @@
['OS=="win"', {
'msvs_guid': '057E7FA0-83C0-11DF-8395-0800200C9A66',
}],
- ['use_fpic==1', {
- 'cflags': ['-fPIC'],
- }],
['OS=="linux"', {
'cflags': ['-Wextra', '-pedantic'],
}],
@@ -227,9 +226,6 @@
'example/Info.plist'
],
}],
- ['use_fpic', {
- 'cflags': ['-fPIC'],
- }],
],
# See README for instructions on how to run and debug on the Mac.
#'conditions' : [
@@ -283,9 +279,6 @@
'product_name': 'ppapi_tests',
'product_extension': 'plugin',
}],
- ['use_fpic', {
- 'cflags': ['-fPIC'],
- }],
],
},
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698