Commit 4aef64db authored by Sylvain Berfini's avatar Sylvain Berfini 🎩
Browse files

Fixed build with Android NDK 22

parent 3d7e614b
......@@ -989,7 +989,7 @@ process_common_toolchain() {
CXX=${COMPILER_LOCATION%/*}/${ANDROID_TEMP_TOOLCHAIN_PREFIX}${_ANDROID_NDK_API_INT}-clang++
if [ -x ${TOOLCHAIN_PATH}ar ]; then
echo "ar, ld, as, strip and nm seems to have the same toolchain path than clang"
echo "ar, as, strip and nm seems to have the same toolchain path than clang"
else
echo "Couldn't find ar at ${TOOLCHAIN_PATH}ar, using ${COMPILER_LOCATION%/*}/${ANDROID_TOOLCHAIN_PREFIX}-ar instead and same for ld, as, strip and nm"
TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/${ANDROID_TOOLCHAIN_PREFIX}-
......@@ -1000,6 +1000,12 @@ process_common_toolchain() {
AS=${TOOLCHAIN_PATH}as
STRIP=${TOOLCHAIN_PATH}strip
NM=${TOOLCHAIN_PATH}nm
if [ -x ${TOOLCHAIN_PATH}ld ]; then
echo "ld seems to have the same toolchain path than clang"
else
LD=${COMPILER_LOCATION%/*}/ld
echo "ld seems to have a different path than other tools: ${LD}"
fi
else
echo "Using gcc at ${COMPILER_LOCATION%/*}/${ANDROID_TEMP_TOOLCHAIN_PREFIX}-gcc"
TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/${ANDROID_TEMP_TOOLCHAIN_PREFIX}-
......
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