diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2016-05-25 13:40:01 +0200 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2016-05-25 13:41:44 +0200 |
| commit | 9327885d141d9cdf8a476640b3e3ce572bd37790 (patch) | |
| tree | f8ff91a5a134c07573653188d3e26363e174d022 | |
| parent | 98bd2231eca3e6cb015fa58877d648857cb816e6 (diff) | |
| download | rockbox-9327885d141d9cdf8a476640b3e3ce572bd37790.tar.gz rockbox-9327885d141d9cdf8a476640b3e3ce572bd37790.zip | |
Use an actually reliable method to determine 32 vs 64 bit
Change-Id: Idba256ae66e67efa7a03f3817bc588e0b4ccd4ba
| -rwxr-xr-x | tools/configure | 10 |
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() | |||
| 748 | fi | 748 | fi |
| 749 | 749 | ||
| 750 | buildhost=$(uname -s | tr "[:upper:]" "[:lower:]") | 750 | buildhost=$(uname -s | tr "[:upper:]" "[:lower:]") |
| 751 | buildhost="${buildhost}-$(uname -m)" | 751 | # the prebuild android NDK only supports intel architecture anyway, so we can take shortcuts |
| 752 | case $(getconf LONG_BIT) in | ||
| 753 | 32) | ||
| 754 | buildhost="${buildhost}-x86" | ||
| 755 | ;; | ||
| 756 | 64) | ||
| 757 | buildhost="${buildhost}-x86_64" | ||
| 758 | ;; | ||
| 759 | esac | ||
| 752 | 760 | ||
| 753 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` | 761 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` |
| 754 | LDOPTS="$LDOPTS -ldl -llog" | 762 | LDOPTS="$LDOPTS -ldl -llog" |