Module Name: src
Committed By: christos
Date: Sun Feb 21 03:34:28 UTC 2016
Modified Files:
src/share/mk: bsd.README bsd.lib.mk bsd.prog.mk
Log Message:
Add NODEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.351 -r1.352 src/share/mk/bsd.README
cvs rdiff -u -r1.363 -r1.364 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.295 -r1.296 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.351 src/share/mk/bsd.README:1.352
--- src/share/mk/bsd.README:1.351 Sat Feb 20 10:18:46 2016
+++ src/share/mk/bsd.README Sat Feb 20 22:34:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.351 2016/02/20 15:18:46 christos Exp $
+# $NetBSD: bsd.README,v 1.352 2016/02/21 03:34:27 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -169,6 +169,9 @@ MKDEBUG If "no", don't build and instal
into /usr/libdata/debug.
Default: no
+NODEBUG Don't compile with debugging symbols during build.
+ It is set internally for standalone programs.
+
MKDEBUGLIB Build *_g.a debugging libraries, which are compiled
with -DDEBUG.
Default: no
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.363 src/share/mk/bsd.lib.mk:1.364
--- src/share/mk/bsd.lib.mk:1.363 Sun Jan 31 10:30:14 2016
+++ src/share/mk/bsd.lib.mk Sat Feb 20 22:34:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.363 2016/01/31 15:30:14 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.364 2016/02/21 03:34:27 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -156,7 +156,7 @@ MKSHLIBOBJS= yes
MKSHLIBOBJS= no
.endif
-.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
+.if (${MKDEBUG:Uno} != "no" && !defined(NODEBUG)) || \
(defined(CFLAGS) && !empty(CFLAGS:M*-g*))
# We only add -g to the shared library objects
# because we don't currently split .a archives.
@@ -407,7 +407,7 @@ _LIB.so:=${_LIB}.so
_LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}
_LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}
_LIB.so.link:=${_LIB}.so.${SHLIB_FULLVERSION}.link
-.if ${MKDEBUG} != "no"
+.if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG)
_LIB.so.debug:=${_LIB.so.full}.debug
.endif
.endif
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.295 src/share/mk/bsd.prog.mk:1.296
--- src/share/mk/bsd.prog.mk:1.295 Sun Jan 31 10:30:14 2016
+++ src/share/mk/bsd.prog.mk Sat Feb 20 22:34:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.295 2016/01/31 15:30:14 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.296 2016/02/21 03:34:27 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -55,7 +55,7 @@ LDFLAGS+= ${PIE_LDFLAGS}
.endif
CFLAGS+= ${COPTS}
-.if defined(MKDEBUG) && (${MKDEBUG} != "no")
+.if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG)
CFLAGS+= -g
.endif
OBJCFLAGS+= ${OBJCOPTS}
@@ -434,7 +434,7 @@ _CCLINK.${_P}= ${CXX} ${_CCLINKFLAGS}
BINDIR.${_P}?= ${BINDIR}
PROGNAME.${_P}?= ${_P}
-.if ${MKDEBUG} != "no" && !commands(${_P})
+.if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P})
_PROGDEBUG.${_P}:= ${PROGNAME.${_P}}.debug
.endif
