Reviewers: Søren Gjesse, bradnelson,

Message:
This is to fix http://code.google.com/p/chromium/issues/detail?id=31274

It needs http://codereview.chromium.org/547019 first.

Description:
arm: fix native compiles


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

SVN Base: http://v8.googlecode.com/svn/trunk/

Affected files:
  M     tools/gyp/v8.gyp


Index: tools/gyp/v8.gyp
===================================================================
--- tools/gyp/v8.gyp    (revision 3577)
+++ tools/gyp/v8.gyp    (working copy)
@@ -199,9 +199,7 @@
       'conditions': [
         # The ARM assembler assumes the host is 32 bits, so force building
         # 32-bit host tools.
- # TODO(piman): This assumes that the host is ia32 or amd64. Fixing the
-        # code would be better
-        ['target_arch=="arm" and _toolset=="host"', {
+        ['target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
           'cflags': ['-m32'],
           'ldflags': ['-m32'],
         }]
@@ -428,9 +426,7 @@
           'conditions': [
# The ARM assembler assumes the host is 32 bits, so force building
             # 32-bit host tools.
- # TODO(piman): This assumes that the host is ia32 or amd64. Fixing
-            # the code would be better
-            ['_toolset=="host"', {
+            ['host_arch=="x64" and _toolset=="host"', {
               'cflags': ['-m32'],
               'ldflags': ['-m32'],
             }]
@@ -598,9 +594,7 @@
       'conditions': [
         # The ARM assembler assumes the host is 32 bits, so force building
         # 32-bit host tools.
-        # TODO(piman): This assumes that the host is ia32 or amd64. Fixing
-        # the code would be better
-        ['target_arch=="arm" and _toolset=="host"', {
+        ['target_arch=="arm" and 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