summaryrefslogtreecommitdiff
path: root/solenv/gbuild/gbuild.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-08-31 12:07:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-08-31 14:27:23 +0200
commit98ad9ec18ee63d6b97b4b90917113656450b81fd (patch)
tree6658ae325594f8f64e510d56efe8deb77e26369d /solenv/gbuild/gbuild.mk
parent8eca83829b21bf17f6a83b87df38862eab490b30 (diff)
Make --enable-assert-always-abort orthogonal of --enable-debug/dbgutil
(and keep enabled by default iff --enable-debug/dbgutil) Change-Id: I962230b4c6623220603cb713c787c69274f63a8f Reviewed-on: https://gerrit.libreoffice.org/59859 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild/gbuild.mk')
-rw-r--r--solenv/gbuild/gbuild.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a67780a2cef8..522183ed9ffc 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -204,13 +204,13 @@ gb_GLOBALDEFS += -DTIMELOG \
endif
-ifeq ($(gb_DEBUGLEVEL),0)
-
ifeq ($(strip $(ASSERT_ALWAYS_ABORT)),FALSE)
gb_GLOBALDEFS += -DNDEBUG \
endif
+ifeq ($(gb_DEBUGLEVEL),0)
+
ifeq ($(ENABLE_SAL_LOG),TRUE)
gb_GLOBALDEFS += -DSAL_LOG_INFO \
-DSAL_LOG_WARN \