Skip to content

Commit

Permalink
build: fix host/target arch detection
Browse files Browse the repository at this point in the history
Setting the target_arch without setting the host_arch as well was
effectively broken.
  • Loading branch information
bnoordhuis committed Jan 12, 2013
1 parent 9aab5d4 commit 9cd9bd3
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion gyp_uv
@@ -1,6 +1,7 @@
#!/usr/bin/env python

import glob
import platform
import os
import subprocess
import sys
Expand All @@ -18,6 +19,14 @@ except ImportError:
sys.exit(42)


def host_arch():
machine = platform.machine()
if machine == 'i386': return 'ia32'
if machine == 'x86_64': return 'x64'
if machine.startswith('arm'): return 'arm'
return machine # Return as-is and hope for the best.


def compiler_version():
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
Expand Down Expand Up @@ -72,8 +81,11 @@ if __name__ == '__main__':
args.append('-Dgcc_version=%d' % (10 * major + minor))
args.append('-Dclang=%d' % int(is_clang))

if not any(a.startswith('-Dhost_arch=') for a in args):
args.append('-Dhost_arch=%s' % host_arch())

if not any(a.startswith('-Dtarget_arch=') for a in args):
args.append('-Dtarget_arch=ia32')
args.append('-Dtarget_arch=%s' % host_arch())

if not any(a.startswith('-Dlibrary=') for a in args):
args.append('-Dlibrary=static_library')
Expand Down

0 comments on commit 9cd9bd3

Please sign in to comment.