solenv/gbuild/gbuild.help.txt | 2 +-
solenv/gbuild/gbuild.mk | 17 ++---------------
solenv/gbuild/platform/com_GCC_defs.mk | 4 ++--
solenv/gbuild/platform/com_MSC_class.mk | 2 +-
4 files changed, 6 insertions(+), 19 deletions(-)
New commits:
commit 42a76c7bf5a6c5cc60487f4bdc7bf0a7bab3c47a
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Mar 20 22:13:22 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 22 08:42:03 2024 +0100
Drop upper-case DEBUG, consolidate on lower-case debug
Change-Id: I352a7c7659e11a4c0800d1a9d73468123b8a5654
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165133
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index fb12142d4aff..1ced8090a458 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -110,7 +110,7 @@ INTERACTIVE VARIABLES:
BUILDTOOLTRACE Run all commands that invoke built tools in strace,
valgrind or a debugger:
BUILDTOOLTRACE='$(DEVENV) /debugexe' PARALLELISM=1 make
- DEBUG / debug If not empty, build as with --enable-debug.
+ debug If not empty, build as with --enable-debug.
ENABLE_SYMBOLS / enable_symbols
If not empty, build as with --enable-symbols.
dbglevel If not empty, force the debug level to the specified
value. The
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f91663e217d1..5b76a58bdada 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -100,13 +100,6 @@ gb_ENABLE_SYMBOLS_FOR := all
endif
gb_DEBUGLEVEL := 0
-ifneq ($(strip $(DEBUG)),)
-gb_DEBUGLEVEL := 1
-# make DEBUG=true should force -g
-ifeq ($(origin DEBUG),command line)
-gb_ENABLE_SYMBOLS_FOR := all
-endif
-endif
ifneq ($(strip $(debug)),)
gb_DEBUGLEVEL := 1
ifeq ($(origin debug),command line)
commit 77b09314b45c178bb8b93e887efb99162c070ab3
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Mar 20 21:16:12 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 22 08:41:55 2024 +0100
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.bergm...@allotropia.de>
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)
