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

Unified Diff: chrome/chrome_tests.gypi

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 | « build/common.gypi ('k') | gpu/demos/demos.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 55834)
+++ chrome/chrome_tests.gypi (working copy)
@@ -480,6 +480,10 @@
'test/nacl_security_tests/nacl_security_tests_win.cc',
],
},],
+ # set fPIC for linux in case it isn't set.
+ ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
+ 'cflags': ['-fPIC'],
+ },],
],
},
{
@@ -2476,8 +2480,10 @@
},
]}, # 'targets'
], # OS=="win"
+ # Build on linux x86_64 only if linux_fpic==1
['OS=="mac" or (OS=="win" and component=="static_library") '
- 'or (OS=="linux" and target_arch==python_arch)', {
+ 'or (OS=="linux" and target_arch==python_arch '
+ 'and (target_arch!="x64" or linux_fpic==1))', {
'targets': [
{
# Documentation: http://dev.chromium.org/developers/pyauto
« no previous file with comments | « build/common.gypi ('k') | gpu/demos/demos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698