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

Stephan Bergmann sbergman at redhat.com
Mon Mar 7 10:46:25 UTC 2016


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

New commits:
commit 4b8c29015d7c70121a161da0f3a85fa4ea0c5987
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 7 11:43:07 2016 +0100

    Make detection of HAVE_CXX14_CONSTEXPR work with "selective debugging"
    
    ...where "make ... debug=t" is used to build some parts of LO with debug enabled
    without re-running autogen.sh (so NDEBUG will start to be undefined, so
    constexpr functions calling assert will start to trigger GCC PR66460).  See mail
    thread starting at
    <https://lists.freedesktop.org/archives/libreoffice/2016-March/073554.html>
    "Compiler crash when building libreoffice with debug."
    
    Change-Id: I6e3c0375c1e5843616fb9fe287d0bf5ee40e64f7

diff --git a/configure.ac b/configure.ac
index f45af61..934d43a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6390,11 +6390,6 @@ fi
 AC_MSG_CHECKING([whether $CXX supports C++14 constexpr])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-if test "$ENABLE_DEBUG" != TRUE -a "$ENABLE_DBGUTIL" != TRUE \
-    -a "$ASSERT_ALWAYS_ABORT" != TRUE
-then
-    CXXFLAGS="$CXXFLAGS -DNDEBUG"
-fi
 AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     // A somewhat over-complicated way of checking for


More information about the Libreoffice-commits mailing list