Date: Tue, 15 Dec 2015 01:37:47 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r292240 - stable/10/share/mk Message-ID: <201512150137.tBF1blJ3031295@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Dec 15 01:37:46 2015 New Revision: 292240 URL: https://svnweb.freebsd.org/changeset/base/292240 Log: Partial MFC r291349: Standardize on OBJTOP in and outside of META MODE. For stable/10 this means bringing OBJTOP support in which simplifies MFCs. Modified: stable/10/share/mk/bsd.obj.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/share/mk/bsd.obj.mk ============================================================================== --- stable/10/share/mk/bsd.obj.mk Tue Dec 15 01:19:19 2015 (r292239) +++ stable/10/share/mk/bsd.obj.mk Tue Dec 15 01:37:46 2015 (r292240) @@ -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. #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512150137.tBF1blJ3031295>