From 851d0e552ef80c394aa0a12812f49fd5efc690b0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 9 Sep 2022 09:10:40 +0200 Subject: [PATCH] Allow to pass LIBCPP_DEBUG into configure ...(e.g., by setting it in autogen.input). I need that with some of my Clang builds until the issue discussed in the mail thread "Pack expansion bug?" is sorted out. (Make sure to even allow passing in an empty > LIBCPP_DEBUG= even though it turned out I needed a non-empty > LIBCPP_DEBUG=-D_LIBCPP_ENABLE_ASSERTIONS=0 in my case.) Change-Id: I353ab535568ebd5add93485c219fe2a06fde0565 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139711 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7c82578933cb..c7509fef481d 100644 --- a/configure.ac +++ b/configure.ac @@ -7481,8 +7481,8 @@ AC_LANG_POP([C++]) AC_SUBST([HAVE_LIBSTDCPP]) AC_SUBST([HAVE_LIBCPP]) -LIBCPP_DEBUG= -if test -z "$CROSS_COMPILING" -a -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL"; then +if test -z "${LIBCPP_DEBUG+x}" -a -z "$CROSS_COMPILING" -a -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL" +then # Libc++ has two levels of debug mode, assertions mode enabled with -D_LIBCPP_DEBUG=0, # and actual debug mode enabled with -D_LIBCPP_DEBUG=1 (and starting with LLVM15 # assertions mode will be separate and controlled by -D_LIBCPP_ENABLE_ASSERTIONS=1,