From caf177c688dc740a68cc399ae936c4ff1cc7799b Mon Sep 17 00:00:00 2001 From: "sgjesse@chromium.org" Date: Wed, 13 Jan 2010 07:35:31 +0000 Subject: [PATCH] Fix ARM cross compiles generated from gyp. Landing of http://codereview.chromium.org/549018. TBR=piman@chromium.org Review URL: http://codereview.chromium.org/546030 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3590 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/gyp/v8.gyp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index ba7224b..4368eb8 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -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'], }] -- 2.7.4