From 7158acde7756a264c09e24e1cfe4c81db700b920 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Nov 2021 11:03:11 +0100 Subject: Consolidate -D_GLIBCXX_DEBUG for --enable-dbgutil builds against libstdc++ (this was meant as a prerequisite for enabling its -D_LIBCPP_DEBUG=1 counterpart when building against libc++ on macOS, but which got stalled for now after running into the issue described at "[libcxx-dev] Building a program with -D_LIBCPP_DEBUG=1 against a libc++ that is not itself built with that define") Change-Id: If466dce595a9311b2afbae41d5ddcaecc6f3c57b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124678 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- external/liborcus/ExternalProject_liborcus.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'external/liborcus') diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 76a2a6afb1f2..3a51917c0a0c 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -58,11 +58,7 @@ endif # library (glibc), the NDK does offer the GNU C++ library as one of # the C++ libraries available, and we use it. # -ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) -ifneq (,$(gb_ENABLE_DBGUTIL)) -liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG -endif -endif +liborcus_CPPFLAGS+=$(gb_COMPILERDEFS_STDLIB_DEBUG) liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS) -- cgit