configure.ac | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit a19b47b5d3e8f20adad614622dd93543a2dc667a
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jan 23 13:30:27 2015 +0200
Make the --with-android-ndk-toolchain-version switch optional
Default to 4.9.
Change-Id: I534b579fece83cfac79cfcd92f40bde5d2f801f5
diff --git a/configure.ac b/configure.ac
index b147aa8..5c67205 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,10 +285,7 @@ AC_ARG_WITH(android-ndk,
AC_ARG_WITH(android-ndk-toolchain-version,
AS_HELP_STRING([--with-android-ndk-toolchain-version],
[Specify which toolchain version to use, of those present in the
- Android NDK you are using. Mandatory if the NDK used has several
- toolchain versions for the host architecture you are building for.
- Possible values are 4.6, 4.8, clang3.3 and clang3.4. Only 4.8 has been
- tested for real...]), ,)
+ Android NDK you are using. The default is 4.9 currently.]), ,)
AC_ARG_WITH(android-sdk,
AS_HELP_STRING([--with-android-sdk],
@@ -331,6 +328,11 @@ if test -n "$with_android_ndk"; then
android_platform_prefix=$android_cpu
fi
+ if test -z "$with_android_ndk_toolchain_version"; then
+ # Default to gcc 4.9
+ with_android_ndk_toolchain_version=4.9
+ fi
+
case "$with_android_ndk_toolchain_version" in
4.6|4.7|4.8|4.9)
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
