Module Name:    src
Committed By:   dholland
Date:           Sun Jan 10 03:59:34 UTC 2016

Modified Files:
        src/share/mk: bsd.sys.mk

Log Message:
For MKREPRO, substitute DESTDIR before NETBSDSRCDIR; then it has a
chance of working if DESTDIR is under NETBSDSRCDIR (as happens with
default objdirs when building someplace random other than /usr/src...)


To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 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.247 src/share/mk/bsd.sys.mk:1.248
--- src/share/mk/bsd.sys.mk:1.247	Sat Jan  9 02:06:22 2016
+++ src/share/mk/bsd.sys.mk	Sun Jan 10 03:59:34 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.247 2016/01/09 02:06:22 christos Exp $
+#	$NetBSD: bsd.sys.mk,v 1.248 2016/01/10 03:59:34 dholland Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -15,14 +15,14 @@ error2:
 .endif
 
 .if ${MKREPRO:Uno} == "yes"
-CPPFLAGS+=	-Wp,-iremap,${NETBSDSRCDIR}:/usr/src
 CPPFLAGS+=	-Wp,-iremap,${DESTDIR}/:/
+CPPFLAGS+=	-Wp,-iremap,${NETBSDSRCDIR}:/usr/src
 CPPFLAGS+=	-Wp,-iremap,${X11SRCDIR}:/usr/xsrc
 .export NETBSDSRCDIR DESTDIR X11SRCDIR
-REPROFLAGS+=	-fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
 .if !empty(DESTDIR)
 REPROFLAGS+=	-fdebug-prefix-map=\$$DESTDIR=
 .endif
+REPROFLAGS+=	-fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
 REPROFLAGS+=	-fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
 REPROFLAGS+=	-fdebug-regex-map='/usr/src/(.*)/obj.${MACHINE}=/usr/obj/\1'
 CFLAGS+=	${REPROFLAGS}

Reply via email to