Fix cross-compilation for ARM (hopefully)

TEST=Arm builder on Chromium waterfall successfully compiles

Review URL: http://codereview.chromium.org/7607032

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8880 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/build/v8-features.gypi b/build/v8-features.gypi
index cb9b61c..099c8f4 100644 (file)
--- a/build/v8-features.gypi
+++ b/build/v8-features.gypi
@@ -99,7 +99,7 @@
               }],
               # The ARM assembler assumes the host is 32 bits,
               # so force building 32-bit host tools.
-              [ 'host_arch=="x64"', {
+              [ 'host_arch=="x64" and _toolset=="host "', {
                 'cflags': ['-m32'],
                 'ldflags': ['-m32'],
               }],

diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index c802e86..d176b93 100644 (file)
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -114,7 +114,7 @@
                   }],
                   # The ARM assembler assumes the host is 32 bits,
                   # so force building 32-bit host tools.
-                  [ 'host_arch=="x64"', {
+                  [ 'host_arch=="x64" and _toolset=="host"', {
                     'cflags': ['-m32'],
                     'ldflags': ['-m32'],
                   }],