Module Name: src
Committed By: martin
Date: Thu Jun 14 20:08:37 UTC 2018
Modified Files:
src/share/mk [netbsd-8]: bsd.sys.mk
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.271.4.1 -r1.271.4.2 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.271.4.1 src/share/mk/bsd.sys.mk:1.271.4.2
--- src/share/mk/bsd.sys.mk:1.271.4.1 Thu Jun 7 15:59:27 2018
+++ src/share/mk/bsd.sys.mk Thu Jun 14 20:08:36 2018
@@ -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 @@ REPROFLAGS+= -fdebug-prefix-map=\$$DESTD
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'
