configure.in | 14 +++++++++++++- solenv/bin/getcompver.awk | 9 +++++++++ 2 files changed, 22 insertions(+), 1 deletion(-)
New commits: commit 659e31939bf364518cfb4e1fa1ac01e0c412b40a Author: Tor Lillqvist <t...@iki.fi> Date: Mon Jul 30 14:01:30 2012 +0300 Accept 4.6.x-google Change-Id: I4eadea9498dcb5f55bd5cc025d2866b39b486cc3 diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk index 124e915..0d3db77 100644 --- a/solenv/bin/getcompver.awk +++ b/solenv/bin/getcompver.awk @@ -68,6 +68,15 @@ BEGIN { CCversion = substr($0, 0, index($0, "-") - 1) } } +# NDK r8b has "4.6.x-google" +/^[0-9]*[.][0-9]*[.][a-z]*-[0-9a-z]*$/ { + if ( compiler_matched == 0 ) { + # Include the second period in the match so that + # we will get a micro version of zero + x = match( $0, /^[0-9]*[.][0-9]*[.]/ ) + CCversion = substr($0, RSTART, RLENGTH) + } +} END { if ( num == "true" ) { tokencount = split (CCversion,vertoken,".") commit 4af021ae0abd83f30ac2a5ad855a6edc37a12324 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Jul 30 14:00:38 2012 +0300 Let's try to use the gold linker when using NDK r8b's GCC 4.6 or newer Change-Id: Ie122a5f3ef8cda58c4fc29f6366bd1d6f6d86dd2 diff --git a/configure.in b/configure.in index a2e1e78..57ebeb5 100644 --- a/configure.in +++ b/configure.in @@ -163,11 +163,23 @@ if test -n "$with_android_ndk"; then 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++/libs/armeabi-v7a" - ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include" else # x86 ANDROIDCFLAGS="-march=atom --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-x86 -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86" + fi + + # When using the 4.6 or newer toolchain, use the gold linker + case "$with_android_ndk_toolchain_version" in + 4.[[6789]]*|[[56789]].*) + ANDROIDCFLAGS="$ANDROIDCFLAGS -fuse-ld=gold" + ;; + esac + + if test $host_cpu = arm; then + ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include" + else # x86 ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86/include" fi + test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-gcc $ANDROIDCFLAGS" test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-g++ $ANDROIDCXXFLAGS" fi _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits