summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Skomski <karl@skomski.com>2012-02-13 14:28:43 +0100
committerBen Noordhuis <info@bnoordhuis.nl>2012-02-13 17:43:30 +0100
commit09ccbef3bbfc4ca14c58dbed4c3c067bd1f1e14c (patch)
treebaaa4d6ce0a1a3179ff5f546ab7010f8c8b1762a
parent3f43b1c039727e12c7a27fb31010aa309a4a35d8 (diff)
downloadnode-09ccbef3bbfc4ca14c58dbed4c3c067bd1f1e14c.tar.gz
build: detect host_arch better
-rwxr-xr-xconfigure15
1 files changed, 8 insertions, 7 deletions
diff --git a/configure b/configure
index 357534611..d370f166c 100755
--- a/configure
+++ b/configure
@@ -148,17 +148,18 @@ def uname(switch):
def host_arch():
"""Host architecture. One of arm, ia32 or x64."""
- arch = uname('-p')
-
- if arch == 'unknown':
- arch = uname('-m')
-
- return {
+ arch = uname('-p')
+ arches = {
'arm': 'arm',
'x86': 'ia32',
'i386': 'ia32',
'x86_64': 'x64',
- }.get(arch, 'ia32')
+ }
+
+ if arches.get(arch) == None:
+ arch = uname('-m')
+
+ return arches.get(arch, 'ia32')
def target_arch():