diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-01-19 14:06:41 +0000 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-01-19 16:34:04 +0000 |
| commit | e46be819fca9468a0cd4e74859ce0f778eb8ca60 (patch) | |
| tree | f9c37105a3367f2ad5d31fbc2cb37b84fa67b59a /tools/gyp/v8.gyp | |
| parent | d0582a6c46733687d045e4188a1bcd0123c758a1 (diff) | |
| download | android_external_v8-e46be819fca9468a0cd4e74859ce0f778eb8ca60.tar.gz android_external_v8-e46be819fca9468a0cd4e74859ce0f778eb8ca60.tar.bz2 android_external_v8-e46be819fca9468a0cd4e74859ce0f778eb8ca60.zip | |
New version of v8 from bleeding edge at revision 3649
Diffstat (limited to 'tools/gyp/v8.gyp')
| -rw-r--r-- | tools/gyp/v8.gyp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index ba7224b4..4368eb81 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'], }] |