Fix MIPS emulation by disabling GCC 4.8
A previous patch switched the standalone toolchain to use
GCC 4.8, instead of 4.6 on Linux. Unfortunately, this breaks
MIPS emulation (Jellybean system image does not boot), and it's
really difficult to understand why.
This patch reverts the Linux toolchain to 4.6, note that this only
affects standalone builds (not platform ones).
Change-Id: I4d4c1bf3fdcd38fd8dbaffcb618319560511962c
diff --git a/android-configure.sh b/android-configure.sh
index e79ce1b..64f2f96 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -107,7 +107,11 @@
# that are compatible with Ubuntu 10.4
if [ -z "$CC" -a -z "$OPTION_CC" -a "$HOST_OS" = linux ] ; then
PREBUILTS_HOST_GCC=$(dirname $0)/../../prebuilts/gcc/linux-x86/host
- PROBE_HOST_CC=$PREBUILTS_HOST_GCC/x86_64-linux-glibc2.11-4.8/bin/x86_64-linux-gcc
+ # NOTE: GCC 4.8 is currently disabled because this breaks MIPS emulation
+ # For some odd reason. Remove the 'DISABLED_' prefix below to re-enable it,
+ # e.g. once the MIPS backend has been updated to a more recent version.
+ # This only affects Linux emulator binaries.
+ PROBE_HOST_CC=$PREBUILTS_HOST_GCC/DISABLED_x86_64-linux-glibc2.11-4.8/bin/x86_64-linux-gcc
if [ ! -f "$PROBE_HOST_CC" ]; then
PROBE_HOST_CC=$PREBUILTS_HOST_GCC/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux-gcc
if [ ! -f "$PROBE_HOST_CC" ] ; then
