Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk For MKREPRO, substitute DESTDIR before NETBSDSRCDIR...



details:   https://anonhg.NetBSD.org/src/rev/5ae553ea7b44
branches:  trunk
changeset: 812963:5ae553ea7b44
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jan 10 03:59:34 2016 +0000

description:
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...)

diffstat:

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

diffs (26 lines):

diff -r b72b191444a6 -r 5ae553ea7b44 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Sun Jan 10 03:19:36 2016 +0000
+++ b/share/mk/bsd.sys.mk       Sun Jan 10 03:59:34 2016 +0000
@@ -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 @@
 .endif
 
 .if ${MKREPRO:Uno} == "yes"
+CPPFLAGS+=     -Wp,-iremap,${DESTDIR}/:/
 CPPFLAGS+=     -Wp,-iremap,${NETBSDSRCDIR}:/usr/src
-CPPFLAGS+=     -Wp,-iremap,${DESTDIR}/:/
 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}



Home | Main Index | Thread Index | Old Index