diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-03-20 21:16:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-03-22 08:41:55 +0100 |
| commit | 77b09314b45c178bb8b93e887efb99162c070ab3 (patch) | |
| tree | f502eed1b82b7e05c2a7592d34bc236b84649450 | |
| parent | 284d80825ec7cf3c39af91959e4bf3d539b066f4 (diff) | |
Drop redundant gb_ENABLE_DBGUTIL
Change-Id: I284e3601ad3d8fe7489e21182a98df40e8d9dbb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165132
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9b3b1d519b05..f91663e217d1 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -84,12 +84,6 @@ ifneq ($(strip $(TIMELOG)$(timelog)),) gb_TIMELOG := 1 endif -ifneq ($(ENABLE_DBGUTIL),) -gb_ENABLE_DBGUTIL := $(true) -else -gb_ENABLE_DBGUTIL := $(false) -endif - gb_ENABLE_SYMBOLS_FOR := $(ENABLE_SYMBOLS_FOR) # ENABLE_SYMBOLS (presumably from the command line) @@ -119,7 +113,7 @@ ifeq ($(origin debug),command line) gb_ENABLE_SYMBOLS_FOR := all endif endif -ifeq ($(gb_ENABLE_DBGUTIL),$(true)) +ifeq ($(ENABLE_DBGUTIL),TRUE) gb_DEBUGLEVEL := 1 endif @@ -230,7 +224,7 @@ gb_GLOBALDEFS := \ $(gb_COMPILERDEFS) \ $(gb_CPUDEFS) \ -ifeq ($(gb_ENABLE_DBGUTIL),$(true)) +ifeq ($(ENABLE_DBGUTIL),TRUE) gb_GLOBALDEFS += -DDBG_UTIL ifneq ($(COM)-$(MSVC_USE_DEBUG_RUNTIME),MSC-) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 57338bc7f170..e8bf170bd454 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -49,7 +49,7 @@ gb_COMPILERDEFS := \ $(if $(filter EMSCRIPTEN,$(OS)),-U_FORTIFY_SOURCE) \ # enable debug STL -ifeq ($(gb_ENABLE_DBGUTIL),$(true)) +ifeq ($(ENABLE_DBGUTIL),TRUE) ifneq ($(HAVE_LIBSTDCPP),) gb_COMPILERDEFS_STDLIB_DEBUG = -D_GLIBCXX_DEBUG else @@ -202,7 +202,7 @@ endif gb_LinkTarget_EXCEPTIONFLAGS := \ -fexceptions -ifeq ($(gb_ENABLE_DBGUTIL),$(false)) +ifeq ($(ENABLE_DBGUTIL),) # Clang doesn't have this option ifeq ($(HAVE_GCC_FNO_ENFORCE_EH_SPECS),TRUE) gb_LinkTarget_EXCEPTIONFLAGS += \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 6c3182b54aa4..eccc64e1b2f1 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -330,7 +330,7 @@ gb_Windows_PE_TARGETTYPEFLAGS := \ -manifest # link.exe in -LIB mode doesn't understand -debug, use it only for EXEs and DLLs -ifeq ($(gb_ENABLE_DBGUTIL),$(true)) +ifeq ($(ENABLE_DBGUTIL),TRUE) # fastlink is faster but pdb files reference .obj files # but don't do that for setup_native DLLs: this produces make error 139 in some configurations gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO = $(if $(filter -U_DLL,$(1)),-debug,-debug:fastlink) |