Module Name:    src
Committed By:   martin
Date:           Mon Jun 18 15:42:29 UTC 2018

Modified Files:
        src/share/mk [netbsd-8]: bsd.sys.mk

Log Message:
Pull up following revision(s) (requested by christos in ticket #886):

        share/mk/bsd.sys.mk: revision 1.282

The compat build plays games with MAKEOBJDIR and unsets MAKEOBJDIRPREFIX.
Keep using our standard NETBSDOBJDIR if it was set.


To generate a diff of this commit:
cvs rdiff -u -r1.271.4.2 -r1.271.4.3 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.2 src/share/mk/bsd.sys.mk:1.271.4.3
--- src/share/mk/bsd.sys.mk:1.271.4.2	Thu Jun 14 20:08:36 2018
+++ src/share/mk/bsd.sys.mk	Mon Jun 18 15:42:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.271.4.2 2018/06/14 20:08:36 martin Exp $
+#	$NetBSD: bsd.sys.mk,v 1.271.4.3 2018/06/18 15:42:29 martin Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -31,6 +31,9 @@ REPROFLAGS+=	-fdebug-prefix-map=\$$NETBS
 REPROFLAGS+=	-fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
 .if defined(MAKEOBJDIRPREFIX)
 NETBSDOBJDIR=	${MAKEOBJDIRPREFIX}${NETBSDSRCDIR}
+.endif
+
+.if defined(NETBSDOBJDIR)
 .export NETBSDOBJDIR
 REPROFLAGS+=	-fdebug-prefix-map=\$$NETBSDOBJDIR=/usr/obj
 .endif

Reply via email to