config_host.mk.in | 1 - configure.ac | 20 -------------------- solenv/gbuild/platform/com_GCC_defs.mk | 4 ---- 3 files changed, 25 deletions(-)
New commits: commit c0f9157cf64242adbc4a9eb7cfac66fffa97e5a2 Author: Luboš Luňák <[email protected]> AuthorDate: Sun May 8 14:52:10 2022 +0200 Commit: Luboš Luňák <[email protected]> CommitDate: Mon May 9 09:13:41 2022 +0200 remove HAVE_LIBCPP_DEBUG (libc++ debug mode) It's currently too broken (https://reviews.llvm.org/D125184), but they're working on fixing it, so hopefully somewhen later. Change-Id: I3ca243a57d41bd9d8c4cdbdc4a6a3b5fdc49e4c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134023 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> diff --git a/config_host.mk.in b/config_host.mk.in index df8205e8ad1d..4d1a98967551 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -305,7 +305,6 @@ export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@ export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@ export HAVE_LIBCPP=@HAVE_LIBCPP@ -export HAVE_LIBCPP_DEBUG=@HAVE_LIBCPP_DEBUG@ export HAVE_LIBSTDCPP=@HAVE_LIBSTDCPP@ export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@ export HAVE_WDEPRECATED_COPY_DTOR=@HAVE_WDEPRECATED_COPY_DTOR@ diff --git a/configure.ac b/configure.ac index ff4aa9cd1c8b..80058aaafb4c 100644 --- a/configure.ac +++ b/configure.ac @@ -7419,26 +7419,6 @@ AC_LANG_POP([C++]) AC_SUBST([HAVE_LIBSTDCPP]) AC_SUBST([HAVE_LIBCPP]) -HAVE_LIBCPP_DEBUG= -if test -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL"; then - # libc++ supports debug mode only if built for it, Mac libc++ isn't, - # and there would be undefined references to debug functions - AC_MSG_CHECKING([if libc++ is built with debug mode]) - AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#define _LIBCPP_DEBUG 1 -#include <vector> -int foo(const std::vector<int>& v) { return *v.begin(); } -]])], - [AC_MSG_RESULT(yes) - HAVE_LIBCPP_DEBUG=1 - ], - [AC_MSG_RESULT(no)] - ) - AC_LANG_POP([C++]) -fi -AC_SUBST([HAVE_LIBCPP_DEBUG]) - dnl =================================================================== dnl Check for gperf dnl =================================================================== diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index c2db27243457..c7cc1c3ef577 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -53,10 +53,6 @@ gb_COMPILERDEFS := \ ifeq ($(gb_ENABLE_DBGUTIL),$(true)) ifneq ($(HAVE_LIBSTDCPP),) gb_COMPILERDEFS_STDLIB_DEBUG = -D_GLIBCXX_DEBUG -else -ifneq ($(HAVE_LIBCPP_DEBUG),) -gb_COMPILERDEFS_STDLIB_DEBUG = -D_LIBCPP_DEBUG=1 -endif endif gb_COMPILERDEFS += $(gb_COMPILERDEFS_STDLIB_DEBUG) endif
