build.mk: Add -DNDEBUG when mode!=debug

 - Add -DNDEBUG to the compiler flags when mode!=debug.
 - Prevent assert() from compiling out in kernel when mode=release

Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>

build.mk

@@ -82,6 +82,11 @@ CFLAGS += -Wno-maybe-uninitialized
 CXXFLAGS += -Wno-maybe-uninitialized
 endif
 
+# Add -DNDEBUG if conf-DEBUG_BUILD is set to 0 in *.mak files above
+ifeq ($(conf-DEBUG_BUILD),0)
+configuration += -DNDEBUG
+endif
+
 arch-cflags = -msse4.1
 
 

conf/base.mak

@@ -4,3 +4,8 @@ conf-debug_memory=0
 
 # debug level logging (enabled automatically in mode=debug)
 conf-logger_debug=0
+
+# Set to 1 in mode=debug.
+# This macro controls the NDEBUG macro that is used to identify the debug
+# build variant in the code.
+conf-DEBUG_BUILD=0

conf/debug.mak

 conf-opt = $(gcc-opt-Og)
 conf-logger_debug=1
+conf-DEBUG_BUILD=1

include/api/assert.h

@@ -5,7 +5,8 @@
 
 #undef assert
 
-#ifdef NDEBUG
+/* We want the assert() not to be compiled out in the kernel */
+#if defined NDEBUG && !defined _KERNEL
 #define	assert(x) (void)0
 #else
 #define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))