[src/trunk]: src/share/mk - use -fdebug-regex-map to remap one style of objec...

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

details:   https://anonhg.NetBSD.org/src/rev/1165d155650c
branches:  trunk
changeset: 812936:1165d155650c
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 09 02:06:22 2016 +0000

description:
- use -fdebug-regex-map to remap one style of object dirs. There are others.
- change DESTDIR to nothing so that we don't get // in the front
- apply the mappings to both c and c++

diffstat:

 share/mk/bsd.sys.mk |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 56f3a0ec34da -r 1165d155650c share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Sat Jan 09 02:00:14 2016 +0000
+++ b/share/mk/bsd.sys.mk       Sat Jan 09 02:06:22 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.246 2015/12/22 16:46:56 christos Exp $
+#      $NetBSD: bsd.sys.mk,v 1.247 2016/01/09 02:06:22 christos Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -19,9 +19,14 @@
 CPPFLAGS+=     -Wp,-iremap,${DESTDIR}/:/
 CPPFLAGS+=     -Wp,-iremap,${X11SRCDIR}:/usr/xsrc
 .export NETBSDSRCDIR DESTDIR X11SRCDIR
-CFLAGS+=       -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
-CFLAGS+=       -fdebug-prefix-map=\$$DESTDIR=/
-CFLAGS+=       -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
+REPROFLAGS+=   -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
+.if !empty(DESTDIR)
+REPROFLAGS+=   -fdebug-prefix-map=\$$DESTDIR=
+.endif
+REPROFLAGS+=   -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
+REPROFLAGS+=   -fdebug-regex-map='/usr/src/(.*)/obj.${MACHINE}=/usr/obj/\1'
+CFLAGS+=       ${REPROFLAGS}
+CXXFLAGS+=     ${REPROFLAGS}
 .endif
 
 # NetBSD sources use C99 style, with some GCC extensions.