[Libreoffice-commits] .: configure.in

Tor Lillqvist tml at kemper.freedesktop.org
Wed Feb 29 10:24:47 PST 2012


 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9b8ae8a484471ce067ad09dc96cad0d87285a6f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Feb 28 21:39:27 2012 +0200

    Don't generate Thumb code to avoid ld bug in NDK r7b

diff --git a/configure.in b/configure.in
index 739ec3e..b0e9ce8 100644
--- a/configure.in
+++ b/configure.in
@@ -108,7 +108,7 @@ if test -n "$with_android_ndk"; then
    test -z "$RANLIB" && RANLIB=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ranlib
    test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip
 
-   ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
+   ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
 
    test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc $ANDROIDCFLAGS"
    test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include"


More information about the Libreoffice-commits mailing list