diff options
author | Bryan Childs <godeater@gmail.com> | 2013-04-26 20:26:40 +0100 |
---|---|---|
committer | Bryan Childs <godeater@rockbox.org> | 2013-04-26 21:42:15 +0200 |
commit | 1489fa3a1576586997a3bb392d383af8c91d1777 (patch) | |
tree | ba3c10666e29c5ebc00ed1ccea74a16734b186ed | |
parent | a2d8d4293a51134761949b22fca528fbd6cae543 (diff) | |
download | rockbox-1489fa3a1576586997a3bb392d383af8c91d1777.tar.gz rockbox-1489fa3a1576586997a3bb392d383af8c91d1777.zip |
Adapt logic in configure script to cope with both x86 and x86_64 architecture Android NDKs
Change-Id: I520443a17f1d9ced43222e14182ca4726717bc32
Reviewed-on: http://gerrit.rockbox.org/458
Reviewed-by: Frank Gevaerts <frank@gevaerts.be>
Tested-by: Frank Gevaerts <frank@gevaerts.be>
-rwxr-xr-x | tools/configure | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/configure b/tools/configure index 0ce5f2cbec..5e32247c28 100755 --- a/tools/configure +++ b/tools/configure @@ -711,7 +711,11 @@ androidcc () { if [ -z "$gccdir" ]; then gccdir=$gcctarget$gccchoice fi - gccprefix=$ANDROID_NDK_PATH/toolchains/$gccdir/prebuilt/$buildhost-x86 + if [ -d $ANDROID_NDK_PATH/toolchains/$gccdir/prebuilt/$buildhost-x86 ]; then + gccprefix=$ANDROID_NDK_PATH/toolchains/$gccdir/prebuilt/$buildhost-x86 + else + gccprefix=$ANDROID_NDK_PATH/toolchains/$gccdir/prebuilt/$buildhost-x86_64 + fi PATH=$PATH:$gccprefix/bin prefixtools $gcctarget } |