diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-07-26 18:54:33 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-07-26 18:55:08 +0200 |
| commit | b115c1cd99b167600158665a5b0dff4c90a21b55 (patch) | |
| tree | 22eeb9d0d8fb44f1342770416852cc3a5d9a83ea | |
| parent | b7654300f0f002193c4e91baabbe6b60a86ca84f (diff) | |
android: configure - add missing flags for x86 targeting
Change-Id: Ia70f713cdfe2b532dfa4b8aa7876f830b3ef8175
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
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" |