configure.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9cd80e1bebf22ab4c54e0196d54588bc137048d8
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Jul 30 18:15:45 2012 +0300
Avoid "note: the mangling of 'va_list' has changed in GCC 4.4" messages
Change-Id: I289aa31a6ef984931f888c127c1a7c30f64b53fc
diff --git a/configure.in b/configure.in
index ba5f3de..48ccef8 100644
--- a/configure.in
+++ b/configure.in
@@ -169,9 +169,9 @@ if test -n "$with_android_ndk"; then
test -z "$STRIP" &&
STRIP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-strip
if test $host_cpu = arm; then
- 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++/${toolchain_version_subdir}libs/armeabi-v7a"
+ ANDROIDCFLAGS="-Wno-psabi -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++/${toolchain_version_subdir}libs/armeabi-v7a"
else # x86
- ANDROIDCFLAGS="-march=atom --sysroot
$ANDROID_NDK_HOME/platforms/android-9/arch-x86
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${toolchain_version_subdir}libs/x86"
+ ANDROIDCFLAGS="-Wno-psabi -march=atom --sysroot
$ANDROID_NDK_HOME/platforms/android-9/arch-x86
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${toolchain_version_subdir}libs/x86"
fi
# When using the 4.6 or newer toolchain, use the gold linker
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
