I think these lines are no longer needed

This commit is contained in:
radius 2015-10-21 17:41:42 -05:00
parent bdc81b232f
commit 51ff4a76be

View File

@ -36,7 +36,7 @@ echo
echo echo
# set a few extra variables with libretro-config.sh # set a few extra variables with libretro-config.sh
. $WORK/libretro-config.sh #. $WORK/libretro-config.sh
# set jobs to 2 if not specified # set jobs to 2 if not specified
if [ -z "$JOBS" ]; then if [ -z "$JOBS" ]; then
@ -113,24 +113,24 @@ if [ "${PLATFORM}" = "android" ]; then
fi fi
# define the compilers # define the compilers
if [ "$HOST_CC" ]; then #if [ "$HOST_CC" ]; then
CC="${HOST_CC}-gcc" # CC="${HOST_CC}-gcc"
CXX="${HOST_CC}-g++" # CXX="${HOST_CC}-g++"
CXX11="${HOST_CC}-g++" # CXX11="${HOST_CC}-g++"
STRIP="${HOST_CC}-strip" # STRIP="${HOST_CC}-strip"
fi #fi
if [ -z "$MAKE" ]; then #if [ -z "$MAKE" ]; then
if uname -s | grep -i MINGW32 > /dev/null 2>&1; then # if uname -s | grep -i MINGW32 > /dev/null 2>&1; then
MAKE=mingw32-make # MAKE=mingw32-make
else # else
if type gmake > /dev/null 2>&1; then # if type gmake > /dev/null 2>&1; then
MAKE=gmake # MAKE=gmake
else # else
MAKE=make # MAKE=make
fi # fi
fi # fi
fi #fi
#if [ -z "$CC" ]; then #if [ -z "$CC" ]; then
# if [ $FORMAT_COMPILER_TARGET = "osx" ]; then # if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
@ -155,16 +155,16 @@ fi
# fi # fi
#fi #fi
if [ "${CC}" ] && [ "${CXX}" ]; then #if [ "${CC}" ] && [ "${CXX}" ]; then
COMPILER="CC=${CC} CXX=${CXX}" # COMPILER="CC=${CC} CXX=${CXX}"
else #else
COMPILER="" # COMPILER=""
fi #fi
echo === BUILDBOT VARS: CC: $CC CXX:: $CXX STRIP: $STRIP COMPILER: $COMPILER === echo === BUILDBOT VARS: CC: $CC CXX:: $CXX STRIP: $STRIP COMPILER: $COMPILER ===
export CC=$CC #export CC=$CC
export CXX=$CXX #export CXX=$CXX
RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT