[src/netbsd-8]: src/share/mk Pull up the following revisions, requestes by ch...

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

details:   https://anonhg.NetBSD.org/src/rev/e59a1c2ddfce
branches:  netbsd-8
changeset: 319889:e59a1c2ddfce
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jun 14 20:08:36 2018 +0000

description:
Pull up the following revisions, requestes by christos in ticket #881:

        share/mk/bsd.sys.mk     revision 1.280, 1.281

Create NETBSDOBJDIR to handle MAKEOBJDIRPREFIX, since that prepends the
prefix to the whole path.
Mention that we cannot handle MAKEOBJDIR

 -

Handle more objdir variations for MKREPRO (untested)

diffstat:

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

diffs (29 lines):

diff -r cc51eddaa099 -r e59a1c2ddfce share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Thu Jun 14 20:01:28 2018 +0000
+++ b/share/mk/bsd.sys.mk       Thu Jun 14 20:08:36 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.271.4.1 2018/06/07 15:59:27 martin Exp $
+#      $NetBSD: bsd.sys.mk,v 1.271.4.2 2018/06/14 20:08:36 martin Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -26,11 +26,19 @@
 CPPFLAGS+=     -Wp,-fno-canonical-system-headers
 CPPFLAGS+=     -Wp,-iremap,${NETBSDSRCDIR}:/usr/src
 CPPFLAGS+=     -Wp,-iremap,${X11SRCDIR}:/usr/xsrc
+
 REPROFLAGS+=   -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
 REPROFLAGS+=   -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
+.if defined(MAKEOBJDIRPREFIX)
+NETBSDOBJDIR=  ${MAKEOBJDIRPREFIX}${NETBSDSRCDIR}
+.export NETBSDOBJDIR
+REPROFLAGS+=   -fdebug-prefix-map=\$$NETBSDOBJDIR=/usr/obj
+.endif
+
 LINTFLAGS+=    -R${NETBSDSRCDIR}=/usr/src -R${X11SRCDIR}=/usr/xsrc
 LINTFLAGS+=    -R${DESTDIR}=
 
+# XXX: Cannot handle MAKEOBJDIR, yet.
 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'