Revision: 8880
Author:   [email protected]
Date:     Wed Aug 10 07:07:26 2011
Log:      Fix cross-compilation for ARM (hopefully)

TEST=Arm builder on Chromium waterfall successfully compiles

Review URL: http://codereview.chromium.org/7607032
http://code.google.com/p/v8/source/detail?r=8880

Modified:
 /branches/bleeding_edge/build/v8-features.gypi
 /branches/bleeding_edge/tools/gyp/v8.gyp

=======================================
--- /branches/bleeding_edge/build/v8-features.gypi      Fri Aug  5 02:44:30 2011
+++ /branches/bleeding_edge/build/v8-features.gypi      Wed Aug 10 07:07:26 2011
@@ -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'],
               }],
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp    Mon Aug  8 07:31:47 2011
+++ /branches/bleeding_edge/tools/gyp/v8.gyp    Wed Aug 10 07:07:26 2011
@@ -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