summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPino Toscano <toscano.pino@tiscali.it>2010-05-25 08:46:39 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-25 08:49:24 (GMT)
commit0a0b37fe0fd1e0152766e3924fdea00427420e39 (patch)
tree6d4f96d2d99cef74bcde114ff3b1673ef88e96e8 /configure
parentcbf05005cf8ad8571b04d3583852d3deb043d2d8 (diff)
downloadQt-0a0b37fe0fd1e0152766e3924fdea00427420e39.zip
Qt-0a0b37fe0fd1e0152766e3924fdea00427420e39.tar.gz
Qt-0a0b37fe0fd1e0152766e3924fdea00427420e39.tar.bz2
Fix architecture detection on GNU/Hurd.
On GNU/Hurd, `uname -m` returns a string like "i686-AT386", which is not recognized. Instead, do a specific mangling on "GNU" host, the same done by autotools' config.guess, so the architecture can be identified and the proper atomic primitives used. Merge-request: 638 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 11 insertions, 0 deletions
diff --git a/configure b/configure
index f2023b8..0111f51 100755
--- a/configure
+++ b/configure
@@ -2755,6 +2755,17 @@ fi
if [ -z "${CFG_HOST_ARCH}" ]; then
case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+ GNU:*:*)
+ CFG_HOST_ARCH=`echo ${UNAME_MACHINE} | sed -e 's,[-/].*$,,'`
+ case "$CFG_HOST_ARCH" in
+ i?86)
+ CFG_HOST_ARCH=i386
+ ;;
+ esac
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " GNU/Hurd ($CFG_HOST_ARCH)"
+ fi
+ ;;
IRIX*:*:*)
CFG_HOST_ARCH=`uname -p`
if [ "$OPT_VERBOSE" = "yes" ]; then