From cf25886e343d3c0bf81bb479ad1ba9a345cdd1db Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 16 Sep 2015 20:58:43 +0000 Subject: [PATCH] META_MODE: Fix OBJROOT ending in two // when it does not yet exist. This would lead to the 2nd build (after the first with a missing OBJROOT) to always rebuild everything as the 'command' would have changed due to the path changing from having // to only /. 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 2cdf5be843a4..691c48be444a 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -34,7 +34,7 @@ OBJROOT ?= ${SB_OBJROOT} .endif OBJROOT ?= ${SRCTOP:H}/obj/ .if ${OBJROOT:M*/} != "" -OBJROOT:= ${OBJROOT:tA}/ +OBJROOT:= ${OBJROOT:H:tA}/ .else OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T} .endif