diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f4f7303c0146..756261a4f052 100644 --- a/configure.ac +++ b/configure.ac @@ -4639,7 +4639,14 @@ AC_SUBST(ENABLE_WERROR) dnl Check for --enable-assert-always-abort, set ASSERT_ALWAYS_ABORT dnl =================================================================== AC_MSG_CHECKING([whether to have assert() failures abort even without --enable-debug]) -if test -n "$enable_assert_always_abort" -a "$enable_assert_always_abort" = "yes"; then +if test -z "$enable_assert_always_abort"; then + if test "$ENABLE_DEBUG" = TRUE; then + enable_assert_always_abort=yes + else + enable_assert_always_abort=no + fi +fi +if test "$enable_assert_always_abort" = "yes"; then ASSERT_ALWAYS_ABORT="TRUE" AC_MSG_RESULT([yes]) else 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 \ |