From 9640d4e9863f92f3b08f37dfd35da72a463dbbb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Boris=20B=C3=BCgling?= <boris@icculus.org>
Date: Wed, 20 Apr 2016 15:05:04 +0200
Subject: [PATCH] Fix for Android NDK r11c

Seems like `RELEASE.TXT` is gone, so `arch` is now used to
determine if we're running on 64bit or not. I'm unsure how
to properly check for this on Windows, though.
---
 setCrossEnvironment-armeabi-v7a.sh | 4 +---
 setCrossEnvironment-armeabi.sh     | 4 +---
 setCrossEnvironment-mips.sh        | 4 +---
 setCrossEnvironment-x86.sh         | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/setCrossEnvironment-armeabi-v7a.sh b/setCrossEnvironment-armeabi-v7a.sh
index 8360f5c..2dcf0d2 100755
--- a/setCrossEnvironment-armeabi-v7a.sh
+++ b/setCrossEnvironment-armeabi-v7a.sh
@@ -7,7 +7,7 @@ IFS='
 
 MYARCH=linux-x86
 if uname -s | grep -i "linux" > /dev/null ; then
-	MYARCH=linux-x86
+	MYARCH=linux-`arch`
 fi
 if uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
@@ -20,8 +20,6 @@ NDK=`which ndk-build`
 NDK=`dirname $NDK`
 #NDK=`readlink -f $NDK`
 
-grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
-
 [ -z "$NDK" ] && { echo "You need Android NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=arm-linux-androideabi
 GCCVER=4.9
diff --git a/setCrossEnvironment-armeabi.sh b/setCrossEnvironment-armeabi.sh
index 0ff22eb..e8ef612 100755
--- a/setCrossEnvironment-armeabi.sh
+++ b/setCrossEnvironment-armeabi.sh
@@ -5,7 +5,7 @@ IFS='
 
 MYARCH=linux-x86
 if uname -s | grep -i "linux" > /dev/null ; then
-	MYARCH=linux-x86
+	MYARCH=linux-`arch`
 fi
 if uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
@@ -18,8 +18,6 @@ NDK=`which ndk-build`
 NDK=`dirname $NDK`
 #NDK=`readlink -f $NDK`
 
-grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
-
 [ -z "$NDK" ] && { echo "You need Android NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=arm-linux-androideabi
 GCCVER=4.9
diff --git a/setCrossEnvironment-mips.sh b/setCrossEnvironment-mips.sh
index 1c5462f..d0660ff 100755
--- a/setCrossEnvironment-mips.sh
+++ b/setCrossEnvironment-mips.sh
@@ -5,7 +5,7 @@ IFS='
 
 MYARCH=linux-x86
 if uname -s | grep -i "linux" > /dev/null ; then
-	MYARCH=linux-x86
+	MYARCH=linux-`arch`
 fi
 if uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
@@ -18,8 +18,6 @@ NDK=`which ndk-build`
 NDK=`dirname $NDK`
 #NDK=`readlink -f $NDK`
 
-grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
-
 [ -z "$NDK" ] && { echo "You need Android NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=mipsel-linux-android
 GCCVER=4.9
diff --git a/setCrossEnvironment-x86.sh b/setCrossEnvironment-x86.sh
index 7c2db80..3cd14fa 100755
--- a/setCrossEnvironment-x86.sh
+++ b/setCrossEnvironment-x86.sh
@@ -5,7 +5,7 @@ IFS='
 
 MYARCH=linux-x86
 if uname -s | grep -i "linux" > /dev/null ; then
-	MYARCH=linux-x86
+	MYARCH=linux-`arch`
 fi
 if uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
@@ -18,8 +18,6 @@ NDK=`which ndk-build`
 NDK=`dirname $NDK`
 #NDK=`readlink -f $NDK`
 
-grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
-
 [ -z "$NDK" ] && { echo "You need Android NDK r8 or newer installed to run this script" ; exit 1 ; }
 GCCPREFIX=i686-linux-android
 GCCVER=4.9