Commit b7d2a9a4 authored by Thomas Guillem's avatar Thomas Guillem

build: fix invalid env.sh when building differents archs

parent ec890fd3
......@@ -18,6 +18,13 @@ if [ -z "$ANDROID_ABI" ]; then
exit 1
fi
if [ -z "$NO_FPU" ];then
NO_FPU=0
fi
if [ -z "$NO_ARMV6" ];then
NO_ARMV6=0
fi
BUILD=0
FETCH=0
RELEASE=0
......@@ -47,6 +54,11 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then
FETCH=1
fi
HAVE_ARM=0
HAVE_X86=0
HAVE_MIPS=0
HAVE_64=0
# Set up ABI variables
if [ ${ANDROID_ABI} = "x86" ] ; then
TARGET_TUPLE="i686-linux-android"
......@@ -423,20 +435,10 @@ EssentialsA
echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" >> env.sh
# CPU flags
if [ -n "${HAVE_ARM}" ]; then
echo "export HAVE_ARM=1" >> env.sh
elif [ -n "${HAVE_X86}" ]; then
echo "export HAVE_X86=1" >> env.sh
elif [ -n "${HAVE_MIPS}" ]; then
echo "export HAVE_MIPS=1" >> env.sh
fi
echo "export HAVE_ARM=${HAVE_ARM}" >> env.sh
echo "export HAVE_X86=${HAVE_X86}" >> env.sh
echo "export HAVE_MIPS=${HAVE_MIPS}" >> env.sh
if [ -n "${NO_ARMV6}" ]; then
echo "export NO_ARMV6=1" >> env.sh
fi
if [ -n "${NO_FPU}" ]; then
echo "export NO_FPU=1" >> env.sh
fi
if [ -n "${HAVE_64}" ]; then
echo "export HAVE_64=1" >> env.sh
fi
echo "export NO_ARMV6=${NO_ARMV6}" >> env.sh
echo "export NO_FPU=${NO_FPU}" >> env.sh
echo "export HAVE_64=${HAVE_64}" >> env.sh
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment