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

Unified Diff: chrome/chrome_tests.gypi

Issue 661218: Fixed pyauto build for chromeos. Added proper sysroot and ability to specify ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 10 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
« build/common.gypi ('K') | « build/common.gypi ('k') | no next file » | 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 40176)
+++ chrome/chrome_tests.gypi (working copy)
@@ -1860,7 +1860,7 @@
]}, # 'targets'
], # OS=="win"
# Build on linux x86_64 only if linux_fpic==1
- ['OS=="mac" or (OS=="linux" and (host_arch!="x64" or linux_fpic==1))', {
+ ['OS=="mac" or (OS=="linux" and (target_arch!="x64" or linux_fpic==1))', {
'targets': [
# TODO(nirnimesh): enable for win - crbug.com/32285
{
@@ -1909,14 +1909,14 @@
['OS=="linux"', {
'include_dirs': [
'..',
- '/usr/include/python2.5',
+ '<(sysroot)/usr/include/python<(python_ver)',
],
'dependencies': [
'../build/linux/system.gyp:gtk',
],
'link_settings': {
'libraries': [
- '-lpython2.5',
+ '-lpython<(python_ver)',
],
},
}],
« build/common.gypi ('K') | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698