Commit c21d6a9a authored by Rafaël Carré's avatar Rafaël Carré

Use gcc 4.7 with NDK r8d

parent 601f3e0a
......@@ -16,10 +16,17 @@ fi
REL=$(grep -o '^r[0-9]*.*' $ANDROID_NDK/RELEASE.TXT 2>/dev/null|cut -b2-)
case "$REL" in
8?)
# NDK >= v8b, both 4.4.3 and 4.6 available,
# we use 4.6 because 4.4.3 doesn't handle threads correctly.
GCCVER=4.6
CXXSTL="/4.6"
# we don't use 4.4.3 because it doesn't handle threads correctly.
# TODO : clang?
if test -d ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.7
# if gcc 4.7 is present, it's there for all the archs (x86, mips, arm)
then
# since r8d
GCCVER=4.7
else
GCCVER=4.6
fi
CXXSTL="/"${GCCVER}
;;
7|8|*)
echo "You need the NDKv8b or later"
......
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