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

[Caolán McNamara]

 configure.ac |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 5d50612bfb5569cfc886d729545a7e9f7840c305
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 16 09:45:18 2016 +0000

    COM_IS_CLANG is used before its set
    
    since
    
    commit 817cd83cb76582cda848da0370d3e1b68f5bbb01
    Author: Peter Foley <pefoley2 at pefoley.com>
    Date:   Mon Jan 18 14:19:51 2016 -0500
    
        Improve LTO flags on Android
    
    so just drop the piece which can never be true here
    
    Change-Id: Ia9d718254d9dda5c25af269221a2acae1eb0566d
    Reviewed-on: https://gerrit.libreoffice.org/32070
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index eb2dd83..3e58408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,11 +536,7 @@ if test -n "$with_android_ndk"; then
     if test "$ENABLE_LTO" = TRUE; then
         # -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
-         if test "$COM_IS_CLANG" = TRUE; then
-            ANDROIDCFLAGS="$ANDROIDCFLAGS -flto"
-        else
-            ANDROIDCFLAGS="$ANDROIDCFLAGS -flto -fuse-linker-plugin -O2"
-        fi
+        ANDROIDCFLAGS="$ANDROIDCFLAGS -flto -fuse-linker-plugin -O2"
     fi
 
     # gdbserver can be in different locations