[Libreoffice-commits] core.git: configure.ac

[Peter Foley]

 configure.ac |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 817cd83cb76582cda848da0370d3e1b68f5bbb01
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Mon Jan 18 14:19:51 2016 -0500

    Improve LTO flags on Android
    
    Change-Id: Idd8a86710b9b93b317b28e092b5bee971645c346
    Reviewed-on: https://gerrit.libreoffice.org/21583
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 3e9e1c0..7bdea6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -514,9 +514,13 @@ if test -n "$with_android_ndk"; then
     esac
 
     if test "$ENABLE_LTO" = TRUE; then
-        # -flto comes from com_GCC_degs.mk, too, but we need to make sure it gets passed as part of
+        # -flto comes from com_GCC_defs.mk, too, but we need to make sure it gets passed as part of
         # $CC and $CXX when building external libraries
-        ANDROIDCFLAGS="$ANDROIDCFLAGS -flto"
+         if test "$COM_IS_CLANG" = TRUE; then
+            ANDROIDCFLAGS="$ANDROIDCFLAGS -flto"
+        else
+            ANDROIDCFLAGS="$ANDROIDCFLAGS -flto -fuse-linker-plugin -O2"
+        fi
     fi
 
     # gdbserver can be in different locations