Use gcc -dumpmachine instead of uname -m32b

Change-Id: I8b61f5991fdb9b3e0c6ed235d0b29ce2c30b1a48

2 files changed, 14 insertions, 4 deletions

diff --git a/configure b/configure
index cb52d4e9..5922e9ac 100755
--- a/configure
+++ b/configure
@@ -3111,8 +3111,13 @@ LIBC="`getconf GNU_LIBC_VERSION`"
 
 KERNEL="`uname -r`"
 
-BUILDHOST="`${srcdir}/config.guess`"
-BUILD_ARCH="`uname -m`"
+if test x"${CC}" != x; then
+    BUILDHOST="`gcc -dumpmachine`"
+    BUILD_ARCH="`echo ${BUILDHOST} | cut -d '-' -f 1`"
+else
+   BUILDHOST="`${srcdir}/config.guess`"
+   BUILD_ARCH="`uname -m`"
+fi
 
 
 HOSTNAME="`uname -n`"
diff --git a/configure.ac b/configure.ac
index e9f931ee..3e3f505a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,8 +57,13 @@ LIBC="`getconf GNU_LIBC_VERSION`"
 AC_SUBST(LIBC)
 KERNEL="`uname -r`"
 AC_SUBST(KERNEL)
-BUILDHOST="`${srcdir}/config.guess`"
-BUILD_ARCH="`uname -m`"
+if test x"${CC}" != x; then
+    BUILDHOST="`gcc -dumpmachine`"
+    BUILD_ARCH="`echo ${BUILDHOST} | cut -d '-' -f 1`"
+else
+   BUILDHOST="`${srcdir}/config.guess`"
+   BUILD_ARCH="`uname -m`"
+fi
 AC_SUBST(BUILD_ARCH)
 AC_SUBST(BUILDHOST)
 HOSTNAME="`uname -n`"