Reviewers: Kevin Millikin,

Message:
Fingers crossed...

Description:
Fix cross-compilation for ARM (hopefully)

TEST=Arm builder on Chromium waterfall successfully compiles


Please review this at http://codereview.chromium.org/7607032/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M build/v8-features.gypi
  M tools/gyp/v8.gyp


Index: build/v8-features.gypi
diff --git a/build/v8-features.gypi b/build/v8-features.gypi
index cb9b61ce93e69a57cf66cc0c2259e88522e0d65d..099c8f429dff7e9a38d0e14b948d37ba20a0f455 100644
--- 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'],
               }],
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index c802e86f95ae0b021c08eb12e16540cee16b0311..d176b93195605fec65d1b19559013121c1115d46 100644
--- 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'],
                   }],


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to