[src/trunk]: src/sys/rump Make it easy to turn -DDIAGNOSTIC off (RUMP_DIAGNOS...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/da476d6ae15e
branches:  trunk
changeset: 780765:da476d6ae15e
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Aug 05 15:37:39 2012 +0000

description:
Make it easy to turn -DDIAGNOSTIC off (RUMP_DIAGNOSTIC=no) and -DDEBUG
on (RUMP_DEBUG=yes).

diffstat:

 sys/rump/Makefile.rump |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 35103f8b694c -r da476d6ae15e sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Sun Aug 05 15:36:19 2012 +0000
+++ b/sys/rump/Makefile.rump    Sun Aug 05 15:37:39 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rump,v 1.61 2011/05/10 00:33:58 matt Exp $
+#      $NetBSD: Makefile.rump,v 1.62 2012/08/05 15:37:39 pooka Exp $
 #
 
 WARNS?=                3       # XXX: src/sys won't compile with -Wsign-compare yet
@@ -24,7 +24,6 @@
 CWARNFLAGS+=   -Wno-format-zero-length -Wno-pointer-sign
 CPPFLAGS+=     -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
 CPPFLAGS+=     -DMAXUSERS=32
-CPPFLAGS+=     -DDIAGNOSTIC
 CPPFLAGS+=     -DCOMPAT_50=1
 CPPFLAGS+=     -DDEBUGPRINT
 CPPFLAGS+=     -I${.CURDIR} -I.
@@ -33,7 +32,15 @@
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpkern/opt
 CPPFLAGS+=     -nostdinc -isystem ${RUMPTOP}/..
 LDFLAGS+=      -T ${RUMPTOP}/ldscript.rump
-#CPPFLAGS+=    -DDEBUG
+
+RUMP_DIAGNOSTIC?=yes
+.if ${RUMP_DIAGNOSTIC} == "yes"
+CPPFLAGS+=     -DDIAGNOSTIC
+.endif
+
+.ifdef RUMP_DEBUG
+CPPFLAGS+=     -DDEBUG
+.endif
 
 .ifdef RUMP_LOCKDEBUG
 CPPFLAGS+=     -DLOCKDEBUG