]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
META_MODE: Fix OBJROOT ending in two // when it does not yet exist.
authorbdrewery <bdrewery@FreeBSD.org>
Wed, 16 Sep 2015 20:58:43 +0000 (20:58 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Wed, 16 Sep 2015 20:58:43 +0000 (20:58 +0000)
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

index 2cdf5be843a4edb1bc6abe92bc4826ba21f73a41..691c48be444af199883be316152221f826ac9fed 100644 (file)
@@ -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