Reviewers: piman,
Description:
Fix ARM cross compiles generated from gyp.
Landing of http://codereview.chromium.org/549018.
tbr=pi...@chromium.org
Please review this at http://codereview.chromium.org/546030
SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/
Affected files:
M tools/gyp/v8.gyp
Index: tools/gyp/v8.gyp
===================================================================
--- tools/gyp/v8.gyp (revision 3589)
+++ 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
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
