reverting change from 0f1fddce41e1 because buildbots have CC set in bash profile

This commit is contained in:
Brad Lassey 2010-07-16 16:11:31 -04:00
parent e4414742e9
commit 9a6159a1f7
2 changed files with 16 additions and 16 deletions

View File

@ -293,14 +293,14 @@ if test "$target" = "arm-android-eabi" ; then
fi
dnl set up compilers
if test -z "$AS"; then AS="$android_toolchain"/bin/arm-eabi-as; fi
if test -z "$CC"; then CC="$android_toolchain"/bin/arm-eabi-gcc; fi
if test -z "$CXX"; then CXX="$android_toolchain"/bin/arm-eabi-g++; fi
if test -z "$CPP"; then CPP="$android_toolchain"/bin/arm-eabi-cpp; fi
if test -z "$LD"; then LD="$android_toolchain"/bin/arm-eabi-ld; fi
if test -z "$AR"; then AR="$android_toolchain"/bin/arm-eabi-ar; fi
if test -z "$RANLIB"; then RANLIB="$android_toolchain"/bin/arm-eabi-ranlib; fi
if test -z "$STRIP"; then STRIP="$android_toolchain"/bin/arm-eabi-strip; fi
AS="$android_toolchain"/bin/arm-eabi-as
CC="$android_toolchain"/bin/arm-eabi-gcc
CXX="$android_toolchain"/bin/arm-eabi-g++
CPP="$android_toolchain"/bin/arm-eabi-cpp
LD="$android_toolchain"/bin/arm-eabi-ld
AR="$android_toolchain"/bin/arm-eabi-ar
RANLIB="$android_toolchain"/bin/arm-eabi-ranlib
STRIP="$android_toolchain"/bin/arm-eabi-strip
CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions -march=armv5te -mthumb-interwork $CFLAGS"

View File

@ -240,14 +240,14 @@ if test "$target" = "arm-android-eabi" ; then
android_platform="$android_ndk"/build/platforms/android-"$android_version"/arch-"$target_cpu"
fi
dnl set up compilers
if test -z "$AS"; then AS="$android_toolchain"/bin/arm-eabi-as; fi
if test -z "$CC"; then CC="$android_toolchain"/bin/arm-eabi-gcc; fi
if test -z "$CXX"; then CXX="$android_toolchain"/bin/arm-eabi-g++; fi
if test -z "$CPP"; then CPP="$android_toolchain"/bin/arm-eabi-cpp; fi
if test -z "$LD"; then LD="$android_toolchain"/bin/arm-eabi-ld; fi
if test -z "$AR"; then AR="$android_toolchain"/bin/arm-eabi-ar; fi
if test -z "$RANLIB"; then RANLIB="$android_toolchain"/bin/arm-eabi-ranlib; fi
if test -z "$STRIP"; then STRIP="$android_toolchain"/bin/arm-eabi-strip; fi
AS="$android_toolchain"/bin/arm-eabi-as
CC="$android_toolchain"/bin/arm-eabi-gcc
CXX="$android_toolchain"/bin/arm-eabi-g++
CPP="$android_toolchain"/bin/arm-eabi-cpp
LD="$android_toolchain"/bin/arm-eabi-ld
AR="$android_toolchain"/bin/arm-eabi-ar
RANLIB="$android_toolchain"/bin/arm-eabi-ranlib
STRIP="$android_toolchain"/bin/arm-eabi-strip
CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CFLAGS"