configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7228e5dc9776e033b1cfb590ecde0be5ef5ff2b7
Author: Peter Foley <pefol...@pefoley.com>
Date: Sun Jan 17 14:26:28 2016 -0500
Fix cross-compilation with in-tree ndk/sdk
The build configure run tries to use the ndk as well.
Prevent this by only auto-detecting the ndk when cross-compiling.
Change-Id: I0c098a7ae3f34cd6210f1b6b14121f62ed892b13
Reviewed-on: https://gerrit.libreoffice.org/21547
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>
diff --git a/configure.ac b/configure.ac
index d814673..47980c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,7 +340,7 @@ AC_ARG_WITH(android-sdk,
,)
ANDROID_NDK_HOME=
-if test -z "$with_android_ndk" -a -e "$SRC_ROOT/external/android-ndk"; then
+if test -z "$with_android_ndk" -a -e "$SRC_ROOT/external/android-ndk" -a
"$build" != "$host"; then
with_android_ndk="$SRC_ROOT/external/android-ndk"
fi
if test -n "$with_android_ndk"; then
@@ -568,7 +568,7 @@ dnl
===================================================================
dnl --with-android-sdk
dnl ===================================================================
ANDROID_SDK_HOME=
-if test -z "$with_android_sdk" -a -e "$SRC_ROOT/external/android-sdk-linux";
then
+if test -z "$with_android_sdk" -a -e "$SRC_ROOT/external/android-sdk-linux" -a
"$build" != "$host"; then
with_android_sdk="$SRC_ROOT/external/android-sdk-linux"
fi
if test -n "$with_android_sdk"; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
