[src/netbsd-7]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/2089d1def3fb
branches:  netbsd-7
changeset: 799304:2089d1def3fb
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon May 11 07:26:05 2015 +0000

description:
Pull up following revision(s) (requested by martin in ticket #746):
        usr.sbin/sysinst/Makefile.inc: revision 1.6-1.7
Make gcc generate better debug info when building with DEBUG set.

diffstat:

 usr.sbin/sysinst/Makefile.inc |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 846831976526 -r 2089d1def3fb usr.sbin/sysinst/Makefile.inc
--- a/usr.sbin/sysinst/Makefile.inc     Mon May 11 06:17:16 2015 +0000
+++ b/usr.sbin/sysinst/Makefile.inc     Mon May 11 07:26:05 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2014/08/06 12:16:12 martin Exp $
+#      $NetBSD: Makefile.inc,v 1.5.4.1 2015/05/11 07:26:05 msaitoh Exp $
 #
 # Makefile for sysinst
 
@@ -6,10 +6,6 @@
 .include "${.CURDIR}/../../../Makefile.inc"
 .endif
 
-.if empty(DBG:M-g)
-COPTS += -Os
-.endif
-
 PROG=          sysinst
 NOMAN=         # defined
 
@@ -55,7 +51,17 @@
                -DCATALOG_DIR=\"${CATALOGDIR}\"
 
 .if (defined(DEBUG))
-CPPFLAGS+=-DDEBUG -g -O0
+.if ${ACTIVE_CC} == "gcc"
+# make gcc run additional passes for better debug info (only needed
+# when compiling with -O0)
+O0TRACKING=    -fvar-tracking-assignments -fvar-tracking
+.endif
+CPPFLAGS+=-DDEBUG
+DBG +=-g -O0 ${O0TRACKING}
+.endif
+
+.if empty(DBG:M-g)
+COPTS += -Os
 .endif
 
 .if (!defined(SMALLPROG) || defined(SMALLPROG_INET6)) && (${USE_INET6} != "no")