From 4d74a8776e38c0e3fb01c22789d37d00bd812ecb Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Tue, 15 Dec 2015 01:37:46 +0000
Subject: Partial MFC r291349:

  Standardize on OBJTOP in and outside of META MODE.

  For stable/10 this means bringing OBJTOP support in which simplifies
  MFCs.
---
 share/mk/bsd.obj.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'share/mk')

diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index a5e8e73..3745f1b 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -46,10 +46,13 @@ __<bsd.obj.mk>__:
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
 CANONICALOBJDIR:=${MAKEOBJDIR}
+OBJTOP?= ${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
 
+OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
+
 #
 # Warn of unorthodox object directory.
 #
-- 
cgit v1.1