luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix host/target arch detection

Browse Source 
Setting the target_arch without setting the host_arch as well was
effectively broken.
This commit is contained in:
Ben Noordhuis 2013-01-13 00:50:57 +01:00
parent 9aab5d4837
commit 9cd9bd33b4
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gyp_uv
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import glob import glob
import platform
import os import os
import subprocess import subprocess
import sys import sys
@ -18,6 +19,14 @@ except ImportError:
sys.exit(42) 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(): def compiler_version():
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE) proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
is_clang = 'clang' in proc.communicate()[0].split('\n')[0] is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
@ -72,8 +81,11 @@ if __name__ == '__main__':
args.append('-Dgcc_version=%d' % (10 * major + minor)) args.append('-Dgcc_version=%d' % (10 * major + minor))
args.append('-Dclang=%d' % int(is_clang)) 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): 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): if not any(a.startswith('-Dlibrary=') for a in args):
args.append('-Dlibrary=static_library') args.append('-Dlibrary=static_library')