mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The x86 NDK toolchain uses a different naming convention for its root

Browse Source 
Blind fix attempt for the Android-X86 tinderbox.

Change-Id: Ib7ae0d077aad149d27c19f1b0137bb87062d0f60
This commit is contained in:
Tor Lillqvist
2013-03-23 08:02:33 +02:00
parent 00050e3799
commit 0fddd7aa82
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -162,21 +162,24 @@ if test -n "$with_android_ndk"; then
if test $host_cpu = arm; then if test $host_cpu = arm; then
android_cpu=arm android_cpu=arm
android_platform_prefix=$android_cpu-linux-androideabi
elif test $host_cpu = mips; then elif test $host_cpu = mips; then
android_cpu=mips android_cpu=mips
android_platform_prefix=$android_cpu-linux-androideabi
else else
# host_cpu is something like "i386" or "i686" I guess, NDK uses # host_cpu is something like "i386" or "i686" I guess, NDK uses
# "x86" in some contexts # "x86" in some contexts
android_cpu=x86 android_cpu=x86
android_platform_prefix=$android_cpu
fi fi
case "$with_android_ndk_toolchain_version" in case "$with_android_ndk_toolchain_version" in
4.6|4.7) 4.6|4.7)
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_cpu-linux-androideabi-$with_android_ndk_toolchain_version ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
;; ;;
clang3.1|clang3.2) clang3.1|clang3.2)
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_cpu-linux-androideabi-4.6 ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6
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
;; ;;