Module Name: src
Committed By: christos
Date: Thu May 24 02:06:31 UTC 2018
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Be more selective about remapping object directories otherwise we pick
objdump and objcopy with the regex.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/share/mk/bsd.sys.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.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.276 src/share/mk/bsd.sys.mk:1.277
--- src/share/mk/bsd.sys.mk:1.276 Sat May 19 13:44:44 2018
+++ src/share/mk/bsd.sys.mk Wed May 23 22:06:31 2018
@@ -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 @@ REPROFLAGS+= -fdebug-prefix-map=\$$X11SR
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}
