From 1489fa3a1576586997a3bb392d383af8c91d1777 Mon Sep 17 00:00:00 2001
From: Bryan Childs <godeater@gmail.com>
Date: Fri, 26 Apr 2013 20:26:40 +0100
Subject: [PATCH] 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>
---
 tools/configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
 }