---

yaml
---
r: 34789
b: refs/heads/master
c: cf8bded
h: refs/heads/master
i:
  34787: 346cc7b
v: v3

Author: arkaitzj

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 33adb7a82464a75d3bb33ce6112e01041b66bbd2
+refs/heads/master: cf8bded7aae0673f9275de7948508da3c2b58650
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/configure

@@ -257,6 +257,16 @@ case $CFG_CPUTYPE in
         err "unknown CPU type: $CFG_CPUTYPE"
 esac
 
+# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
+if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
+then
+    file -L "$SHELL" | grep -q "x86[_-]64"
+    if [ $? != 0 ]; then
+        CFG_CPUTYPE=i686
+    fi
+fi
+
+
 DEFAULT_HOST_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
 
 CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"