configure.ac | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit b115c1cd99b167600158665a5b0dff4c90a21b55
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed Jul 26 18:54:33 2017 +0200
android: configure - add missing flags for x86 targeting
Change-Id: Ia70f713cdfe2b532dfa4b8aa7876f830b3ef8175
diff --git a/configure.ac b/configure.ac
index cc4f11844b28..d0ecde9d9f36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,7 +414,6 @@ if test -n "$with_android_ndk"; then
# Default to Clang 5.0
with_android_ndk_toolchain_version=clang5.0
fi
-
case "$with_android_ndk_toolchain_version" in
clang5.0)
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.9
@@ -511,7 +510,7 @@ if test -n "$with_android_ndk"; then
ANDROIDCFLAGS=""
else # x86
ANDROID_APP_ABI=x86
- ANDROIDCFLAGS="-march=atom"
+ ANDROIDCFLAGS="-march=atom -gcc-toolchain
$ANDROID_BINUTILS_PREBUILT_ROOT -target i686-none-linux-android"
fi
ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections"
ANDROIDCFLAGS="$ANDROIDCFLAGS
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
