summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-02 21:03:18 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-02 21:03:18 +0000
commit9ae4b1f5c75bc8110e811313ac02736e0ed042e2 (patch)
tree4889db365e0208b49452eb0b4b78c2857b93f523
parent5618780a18c479624048243f01554c2dba4c5a26 (diff)
downloadchromium_src-9ae4b1f5c75bc8110e811313ac02736e0ed042e2.zip
chromium_src-9ae4b1f5c75bc8110e811313ac02736e0ed042e2.tar.gz
chromium_src-9ae4b1f5c75bc8110e811313ac02736e0ed042e2.tar.bz2
Fixed cross compile build break on linux. For now, pyauto can only be built on linux where host and target architecture are the same.
Review URL: http://codereview.chromium.org/660393 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40428 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_tests.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 53a7c65..3a004ba 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1864,7 +1864,7 @@
]}, # 'targets'
], # OS=="win"
# Build on linux x86_64 only if linux_fpic==1
- ['OS=="mac" or (OS=="linux" and (target_arch!="x64" or linux_fpic==1))', {
+ ['OS=="mac" or chromeos==1 or (OS=="linux" and target_arch==host_arch and (target_arch!="x64" or linux_fpic==1))', {
'targets': [
# TODO(nirnimesh): enable for win - crbug.com/32285
{