Kaydet (Commit) c32f6050 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Use the 4.8 gcc toolchain in conjunction with Clang for Android

That's what the $NDK/toolchains/arm-linux-androideabi-clang3.4/setup.mk does,
too.

Change-Id: I90555bc5f026761ebcf7a2dce650382b6c0d94da
üst 5b1b1e55
...@@ -272,7 +272,7 @@ if test -n "$with_android_ndk"; then ...@@ -272,7 +272,7 @@ if test -n "$with_android_ndk"; then
;; ;;
clang3.3|clang3.4) clang3.3|clang3.4)
AC_MSG_WARN([Building with the Clang tool-chain is known to break in the bridges module, fix that please]) AC_MSG_WARN([Building with the Clang tool-chain is known to break in the bridges module, fix that please])
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6 ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.8
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang} ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
ANDROID_USING_CLANG=true ANDROID_USING_CLANG=true
;; ;;
...@@ -314,7 +314,7 @@ if test -n "$with_android_ndk"; then ...@@ -314,7 +314,7 @@ if test -n "$with_android_ndk"; then
*/bin\ */bin*) */bin\ */bin*)
# Trailing slash intentional and necessary, compare to how this is used # Trailing slash intentional and necessary, compare to how this is used
if test -n "$ANDROID_USING_CLANG"; then if test -n "$ANDROID_USING_CLANG"; then
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=4.6/ ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=4.8/
else else
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/" ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/"
fi fi
......
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