diff options
Diffstat (limited to 'deps/v8/tools/gyp/v8.gyp')
| -rw-r--r-- | deps/v8/tools/gyp/v8.gyp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp index ba7224b4a..4368eb81b 100644 --- a/deps/v8/tools/gyp/v8.gyp +++ b/deps/v8/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'], }] |