diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-11-04 11:03:11 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-11-04 12:49:44 +0100 |
commit | 7158acde7756a264c09e24e1cfe4c81db700b920 (patch) | |
tree | e9bc75e50e405f61ef37fbd2f9cef40d364a9505 /solenv | |
parent | 995a6b38d5b8ac8aabca54f991caaaf35e6db395 (diff) |
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
<https://lists.llvm.org/pipermail/libcxx-dev/2021-October/001222.html>
"[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 <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 8 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 7 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 7 |
3 files changed, 8 insertions, 14 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index de3359f5dbd2..25c8de98f2c6 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -49,6 +49,14 @@ gb_COMPILERDEFS := \ -DCPPU_ENV=$(CPPU_ENV) \ $(if $(filter EMSCRIPTEN,$(OS)),-U_FORTIFY_SOURCE) \ +# enable debug STL +ifeq ($(gb_ENABLE_DBGUTIL),$(true)) +ifneq ($(HAVE_LIBSTDCPP),) +gb_COMPILERDEFS_STDLIB_DEBUG = -D_GLIBCXX_DEBUG +endif +gb_COMPILERDEFS += $(gb_COMPILERDEFS_STDLIB_DEBUG) +endif + gb_CFLAGS_COMMON := \ -Wall \ -Wendif-labels \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index e0ffc0d6df0b..3f9e0fde335e 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -53,13 +53,6 @@ gb_CXXFLAGS := \ -Woverloaded-virtual \ $(CXXFLAGS_CXX11) \ -# enable debug STL -ifeq ($(gb_ENABLE_DBGUTIL),$(true)) -gb_COMPILERDEFS += \ - -D_GLIBCXX_DEBUG \ - -endif - ifneq ($(strip $(SYSBASE)),) gb_CXXFLAGS += --sysroot=$(SYSBASE) gb_CFLAGS += --sysroot=$(SYSBASE) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 644301ac21b9..10ce62f891ba 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -58,13 +58,6 @@ gb_CXXFLAGS := \ $(gb_CXX_LINKFLAGS) \ -# enable debug STL -ifeq ($(gb_ENABLE_DBGUTIL),$(true)) -gb_COMPILERDEFS += \ - -D_GLIBCXX_DEBUG \ - -endif - ifneq ($(strip $(SYSBASE)),) gb_CXXFLAGS += --sysroot=$(SYSBASE) gb_CFLAGS += --sysroot=$(SYSBASE) |