diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-16 11:48:34 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-16 13:05:44 +0300 |
| commit | c32f6050bd41e4b404002593d1e95558f8db4a35 (patch) | |
| tree | a7dbc95fa7df50b362592b16cb067cee6ca955d2 | |
| parent | 5b1b1e55ce492ceb1a907833f7073b46451760c6 (diff) | |
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
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 05a2931da38f..bc4206ad650a 100644 --- a/configure.ac +++ b/configure.ac @@ -272,7 +272,7 @@ if test -n "$with_android_ndk"; then ;; clang3.3|clang3.4) 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_USING_CLANG=true ;; @@ -314,7 +314,7 @@ if test -n "$with_android_ndk"; then */bin\ */bin*) # Trailing slash intentional and necessary, compare to how this is used if test -n "$ANDROID_USING_CLANG"; then - ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=4.6/ + ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=4.8/ else ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/" fi |