[src/trunk]: src/share/mk Be more selective about remapping object directorie...

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

details:   https://anonhg.NetBSD.org/src/rev/3e0c5db4979f
branches:  trunk
changeset: 319287:3e0c5db4979f
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 24 02:06:31 2018 +0000

description:
Be more selective about remapping object directories otherwise we pick
objdump and objcopy with the regex.

XXX: pullup-8

diffstat:

 share/mk/bsd.sys.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 9d2c0350ac22 -r 3e0c5db4979f share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Thu May 24 00:27:24 2018 +0000
+++ b/share/mk/bsd.sys.mk       Thu May 24 02:06:31 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.276 2018/05/19 17:44:44 christos Exp $
+#      $NetBSD: bsd.sys.mk,v 1.277 2018/05/24 02:06:31 christos Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -31,8 +31,10 @@
 LINTFLAGS+=    -R${NETBSDSRCDIR}=/usr/src -R${X11SRCDIR}=/usr/xsrc
 LINTFLAGS+=    -R${DESTDIR}=
 
-REPROFLAGS+=   -fdebug-regex-map='/usr/src/(.*)/obj.*=/usr/obj/\1'
-REPROFLAGS+=   -fdebug-regex-map='/usr/src/(.*)/obj.*/(.*)=/usr/obj/\1/\2'
+REPROFLAGS+=   -fdebug-regex-map='/usr/src/(.*)/obj$$=/usr/obj/\1'
+REPROFLAGS+=   -fdebug-regex-map='/usr/src/(.*)/obj/(.*)=/usr/obj/\1/\2'
+REPROFLAGS+=   -fdebug-regex-map='/usr/src/(.*)/obj\..*=/usr/obj/\1'
+REPROFLAGS+=   -fdebug-regex-map='/usr/src/(.*)/obj\..*/(.*)=/usr/obj/\1/\2'
 
 CFLAGS+=       ${REPROFLAGS}
 CXXFLAGS+=     ${REPROFLAGS}