From 0d0ef329514da0dba68bf3b0399bb970c31667ae Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 31 Mar 2016 00:26:40 +0000 Subject: [PATCH] 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 --- share/mk/local.meta.sys.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk index a7e1016a563..0e985b0b20f 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -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=