diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-04-30 21:27:20 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-05-01 08:40:12 +0200 |
| commit | 6014f363a08f2edd6086cf30b3bbb913f1c621c6 (patch) | |
| tree | f933ad4116b9430089da50177332445cfea17306 /solenv/gbuild | |
| parent | 5200a73627d13e2997f81b53f61e143e77e328ee (diff) | |
improve support for using libc++ on Linux and for libc++ debug mode
It seems to run slightly faster in --enable-dbgutil mode and also
builds a bit faster (at least with Clang). But libc++ on Mac
isn't built with debug mode support.
Change-Id: Idf5dba9c4a56aba1f4163aa518a78d34b6837149
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133664
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index c7cc1c3ef577..c2db27243457 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -53,6 +53,10 @@ 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 diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index b98732030b32..b3388eec436a 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -47,6 +47,10 @@ gb_CFLAGS := \ ifneq ($(HAVE_LIBSTDCPP),) gb_CXX_LINKFLAGS := -pthread endif +# libc++ needs it too +ifneq ($(HAVE_LIBCPP),) +gb_CXX_LINKFLAGS := -pthread +endif gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ |