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

[Peter Foley]

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

New commits:
commit f78de4441508fc81b1e013b907903df9ac4fe664
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Mon Jan 18 14:40:59 2016 -0500

    Fix visibility check for lto on android
    
    Change-Id: I5eea41feca7d5ab8b9d104e8356dce8831883a48
    Reviewed-on: https://gerrit.libreoffice.org/21585
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/configure.ac b/configure.ac
index d5ae425..0f9fa82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6513,7 +6513,7 @@ __attribute__ ((visibility ("default"))) void TestFunc() {
   TestStruct::Init();
 }
 _ACEOF
-        if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
+        if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx; then
             gccvisbroken=yes
         else
             case "$host_cpu" in
@@ -6521,7 +6521,7 @@ _ACEOF
                 if test "$_os" = "Darwin" -o "$WITH_MINGW" = "yes"; then
                     gccvisbroken=no
                 else
-                    if $EGREP -q '@PLT|@GOT' visibility.s; then
+                    if $EGREP -q '@PLT|@GOT' visibility.s || test "$ENABLE_LTO" = "TRUE"; then
                         gccvisbroken=no
                     else
                         gccvisbroken=yes