Date: Thu, 31 Mar 2016 00:26:40 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297438 - head/share/mk Message-ID: <201603310026.u2V0Qe3N060823@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Mar 31 00:26:40 2016 New Revision: 297438 URL: https://svnweb.freebsd.org/changeset/base/297438 Log: DIRDEPS_BUILD: Don't reset OBJROOT in sub-makes. MAKEOBJDIRPREFIX is set to blank and exported from MAKELEVEL0 along with OBJROOT exported. In sub-makes OBJROOT is recalculated with an empty MAKEOBJDIRPREFIX though. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Wed Mar 30 23:56:43 2016 (r297437) +++ head/share/mk/local.meta.sys.mk Thu Mar 31 00:26:40 2016 (r297438) @@ -10,7 +10,7 @@ MK_INSTALL_AS_USER= yes _default_makeobjdir=$${.CURDIR:S,^$${SRCTOP},$${OBJTOP},} .if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 -.if defined(MAKEOBJDIRPREFIX) +.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) # put things approximately where they want OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP}/ MAKEOBJDIRPREFIX=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603310026.u2V0Qe3N060823>