From 9327885d141d9cdf8a476640b3e3ce572bd37790 Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Wed, 25 May 2016 13:40:01 +0200
Subject: Use an actually reliable method to determine 32 vs 64 bit

Change-Id: Idba256ae66e67efa7a03f3817bc588e0b4ccd4ba
---
 tools/configure | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'tools/configure')

diff --git a/tools/configure b/tools/configure
index 0c040455ae..ff05747853 100755
--- a/tools/configure
+++ b/tools/configure
@@ -748,7 +748,15 @@ androidndkcc()
     fi
 
     buildhost=$(uname -s | tr "[:upper:]" "[:lower:]")
-    buildhost="${buildhost}-$(uname -m)"
+    # the prebuild android NDK only supports intel architecture anyway, so we can take shortcuts
+    case $(getconf LONG_BIT) in
+        32)
+            buildhost="${buildhost}-x86"
+            ;;
+        64)
+            buildhost="${buildhost}-x86_64"
+            ;;
+    esac
 
     GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
     LDOPTS="$LDOPTS -ldl -llog"
-- 
cgit v1.2.3