summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-06-19 15:33:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-06-19 17:02:55 +0200
commit2f00ece21d4d51b553fd905b9a2e8eed12adf195 (patch)
treed8bd5d698de26bdb099f892e68564119d89a63a3 /solenv/gbuild
parenta60dd9ef1361c5925803acaa5292e99277d1faf3 (diff)
Make --enable-sal-log orthogonal to --enable-debug
...for consistency with other options like --enable-assert-always-abort Change-Id: I3734485e03203aaee065e1435dfd33f980b1b5eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96736 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/gbuild.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9b..64ca8184e2fa 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -235,18 +235,13 @@ gb_GLOBALDEFS += -DNDEBUG \
endif
-ifeq ($(gb_DEBUGLEVEL),0)
-
ifeq ($(ENABLE_SAL_LOG),TRUE)
gb_GLOBALDEFS += -DSAL_LOG_INFO \
-DSAL_LOG_WARN \
endif
-else
-gb_GLOBALDEFS += -DSAL_LOG_INFO \
- -DSAL_LOG_WARN \
-
+ifneq ($(gb_DEBUGLEVEL),0)
ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
gb_GLOBALDEFS += -DDEBUG \