---

yaml
---
r: 2419
b: refs/heads/master
c: f8514d9
h: refs/heads/master
i:
  2417: c68b25a
  2415: 47f048c
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 106216d67358f13f4be296ee59f711a1f1566bbe
+refs/heads/master: f8514d95d07e48f766ee7a4b8d65d5d5256466f6

trunk/configure

@@ -127,7 +127,17 @@ need_cmd sed
 msg "inspecting environment"
 
 CFG_OSTYPE=$(uname -s)
+
 CFG_CPUTYPE=$(uname -m)
+if [ $CFG_OSTYPE = Darwin -a $CFG_CPUTYPE = i386 ]
+then
+    # Darwin's `uname -s` lies and always returns i386. We have to use sysctl
+    # instead.
+    if sysctl hw.optional.x86_64 | grep ': 1'
+    then
+        CFG_CPUTYPE=x86_64
+    fi
+fi
 
 CFG_SELF=$(echo $0 | tr '\\' '/')
 CFG_SRC_DIR=${CFG_SELF%${CFG_SELF##*/}}