summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2016-05-25 13:40:01 +0200
committerFrank Gevaerts <frank@gevaerts.be>2016-05-25 13:41:44 +0200
commit9327885d141d9cdf8a476640b3e3ce572bd37790 (patch)
treef8ff91a5a134c07573653188d3e26363e174d022 /tools/configure
parent98bd2231eca3e6cb015fa58877d648857cb816e6 (diff)
downloadrockbox-9327885d141d9cdf8a476640b3e3ce572bd37790.tar.gz
rockbox-9327885d141d9cdf8a476640b3e3ce572bd37790.tar.bz2
rockbox-9327885d141d9cdf8a476640b3e3ce572bd37790.zip
Use an actually reliable method to determine 32 vs 64 bit
Change-Id: Idba256ae66e67efa7a03f3817bc588e0b4ccd4ba
Diffstat (limited to 'tools/configure')
-rwxr-xr-xtools/configure10
1 files changed, 9 insertions, 1 deletions
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"