Module Name: src
Committed By: christos
Date: Wed Jun 13 15:46:26 UTC 2018
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Create NETBSDOBJDIR to handle MAKEOBJDIRPREFIX, since that prepends the
prefix to the whole path.
Mention that we cannot handle MAKEOBJDIR
To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 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.280 src/share/mk/bsd.sys.mk:1.281
--- src/share/mk/bsd.sys.mk:1.280 Sun Jun 10 21:34:03 2018
+++ src/share/mk/bsd.sys.mk Wed Jun 13 11:46:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.280 2018/06/11 01:34:03 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.281 2018/06/13 15:46:26 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -26,17 +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)
-REPROFLAGS+= -fdebug-prefix-map=\$$MAKEOBJDIRPREFIX=/usr/obj
-.endif
-.if defined(MAKEOBJDIR)
-REPROFLAGS+= -fdebug-prefix-map=\$$MAKEOBJDIR=/usr/obj
+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'
