From 131654d937dbf6ace54bc1a2a4eacd2b8b8322a0 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Sun, 8 Aug 2021 11:54:40 +0200
Subject: [PATCH] buildsystem: use -DNDEBUG not only for cmake release builds

---
 config/functions | 12 ++++++------
 config/optimize  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/functions b/config/functions
index 82041fc97a..2071538edc 100644
--- a/config/functions
+++ b/config/functions
@@ -391,9 +391,9 @@ setup_toolchain() {
         echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
         echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_CPP_COMPILER $CPP)" >> $CMAKE_CONF
-        echo "SET(CMAKE_ASM_FLAGS_MINSIZEREL -DNDEBUG)" >> $CMAKE_CONF
-        echo "SET(CMAKE_CXX_FLAGS_MINSIZEREL -DNDEBUG)" >> $CMAKE_CONF
-        echo "SET(CMAKE_C_FLAGS_MINSIZEREL -DNDEBUG)" >> $CMAKE_CONF
+        echo "SET(CMAKE_ASM_FLAGS_MINSIZEREL -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_CXX_FLAGS_MINSIZEREL -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_C_FLAGS_MINSIZEREL -DDUMMYOPT)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH  $SYSROOT_PREFIX)"   >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)"  >> $CMAKE_CONF
@@ -446,9 +446,9 @@ setup_toolchain() {
         echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
         echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF
-        echo "SET(CMAKE_ASM_FLAGS_RELEASE -DNDEBUG)" >> $CMAKE_CONF
-        echo "SET(CMAKE_CXX_FLAGS_RELEASE -DNDEBUG)" >> $CMAKE_CONF
-        echo "SET(CMAKE_C_FLAGS_RELEASE -DNDEBUG)" >> $CMAKE_CONF
+        echo "SET(CMAKE_ASM_FLAGS_RELEASE -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_CXX_FLAGS_RELEASE -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_C_FLAGS_RELEASE -DDUMMYOPT)" >> $CMAKE_CONF
         echo "SET(CMAKE_AR $AR CACHE FILEPATH "Archiver")" >> $CMAKE_CONF # hum?
         echo "SET(CMAKE_FIND_ROOT_PATH  $TOOLCHAIN)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF
diff --git a/config/optimize b/config/optimize
index d8486d2af4..d81eefea87 100644
--- a/config/optimize
+++ b/config/optimize
@@ -31,13 +31,13 @@ LDFLAGS_OPTIM_LTO_COMMON="-fuse-linker-plugin"
 LDFLAGS_OPTIM_GOLD="-fuse-ld=gold"
 
 # default compiler optimization
-CFLAGS_OPTIM_DEFAULT="-O2 -fomit-frame-pointer"
+CFLAGS_OPTIM_DEFAULT="-O2 -fomit-frame-pointer -DNDEBUG"
 CXXFLAGS_OPTIM_DEFAULT="$CFLAGS_OPTIM_DEFAULT"
 # speed flag
-CFLAGS_OPTIM_SPEED="-O3 -fomit-frame-pointer"
+CFLAGS_OPTIM_SPEED="-O3 -fomit-frame-pointer -DNDEBUG"
 CXXFLAGS_OPTIM_SPEED="$CFLAGS_OPTIM_SPEED"
 # size flag
-CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer"
+CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer -DNDEBUG"
 CXXFLAGS_OPTIM_SIZE="$CFLAGS_OPTIM_SIZE"
 # debug settings
 CFLAGS_OPTIM_DEBUG="-ggdb -Os"