From f6921d9161a03c6905c21d71d53f7499a4e7b6e2 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Sat, 24 Oct 2020 18:00:55 +0200 Subject: [PATCH] Do not honor stdlib-debug when c++library is not gcc's libstdc++ Actually the real difference is that it does not complain about system boost any more when LLVM's libc++ is used. --- config/lyxinclude.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index b61ea59ac5..0e9b426061 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -422,14 +422,14 @@ if test x$GXX = xyes; then if test x$enable_stdlib_debug = xyes ; then dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0 dnl See http://clang-developers.42468.n3.nabble.com/libc-debug-mode-td3336742.html - case $gxx_version in - *) + if test x$lyx_cv_lib_stdcxx = xyes ; then lyx_flags="$lyx_flags stdlib-debug" AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode]) AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode]) AC_SUBST(STDLIB_DEBUG, "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC") - ;; - esac + else + enable_stdlib_debug=no + fi fi fi