diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-03-20 22:53:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-03-22 08:42:25 +0100 |
| commit | b42429f68cb83fcfc5de102b0922b05ecd6c528e (patch) | |
| tree | 6eafaac6df1ada6ea243d0a841335383134aba77 /solenv/gbuild | |
| parent | 8e10fd30cf7ef5774c54dc2dce0f8e00b279b106 (diff) | |
Determine OSL_DEBUG_LEVEL directly from dbglevel
...and reorder the code a bit, so that the dbglevel-releated code is separated
from the gb_ENABLE_SYMBOLS_FOR-related code
Change-Id: I80649b32fd6cceb8df1e4e2e29e98508e28f338b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165136
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 42a2617b92c1..a36b2b758479 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -84,31 +84,30 @@ ifneq ($(strip $(TIMELOG)$(timelog)),) gb_TIMELOG := 1 endif +ifeq ($(strip $(dbglevel)),) +ifeq ($(debug),) +dbglevel := 0 +else +dbglevel := 1 +endif +endif + gb_ENABLE_SYMBOLS_FOR := $(ENABLE_SYMBOLS_FOR) # enable_symbols (presumably from the command line) ifneq ($(strip $(enable_symbols)),) gb_ENABLE_SYMBOLS_FOR := $(enable_symbols) endif - -# note: ENABLE_BREAKPAD turns on symbols -ifneq ($(strip $(ENABLE_BREAKPAD)),) -gb_ENABLE_SYMBOLS_FOR := all -endif - -gb_DEBUGLEVEL := 0 -ifneq ($(strip $(debug)),) -gb_DEBUGLEVEL := 1 ifeq ($(origin debug),command line) gb_ENABLE_SYMBOLS_FOR := all endif -endif - -ifneq ($(strip $(dbglevel)),) -gb_DEBUGLEVEL := $(strip $(dbglevel)) ifeq ($(origin dbglevel),command line) gb_ENABLE_SYMBOLS_FOR := all endif + +# note: ENABLE_BREAKPAD turns on symbols +ifneq ($(strip $(ENABLE_BREAKPAD)),) +gb_ENABLE_SYMBOLS_FOR := all endif # handle special cases @@ -206,7 +205,7 @@ gb_CPUDEFS += -D$(CPUNAME) gb_GLOBALDEFS := \ -D_REENTRANT \ - -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ + -DOSL_DEBUG_LEVEL=$(dbglevel) \ $(gb_OSDEFS) \ $(gb_COMPILERDEFS) \ $(gb_CPUDEFS) \ |