Revision: 3590
Author: [email protected]
Date: Tue Jan 12 23:35:31 2010
Log: Fix ARM cross compiles generated from gyp.
Landing of http://codereview.chromium.org/549018.
[email protected]
Review URL: http://codereview.chromium.org/546030
http://code.google.com/p/v8/source/detail?r=3590
Modified:
/branches/bleeding_edge/tools/gyp/v8.gyp
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp Wed Dec 2 05:38:50 2009
+++ /branches/bleeding_edge/tools/gyp/v8.gyp Tue Jan 12 23:35:31 2010
@@ -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
