From d0d51d985af21ddee80ae7f3c1406b10d23c8b05 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Thu, 17 Sep 2015 04:22:00 +0000 Subject: [PATCH] META_MODE: Default OBJROOT to the traditional /usr/src/SRCTOP/. This avoids easily colliding multiple src trees with the same objects. Having multiple checkouts in dir/ dir2/ dir3/ would all use obj/ without any unique identifier inside of obj/. This pattern is more likely to be used due to the non-META_MODE behavior working with it fine. In environments where ../obj/ is wanted as the obj directory the value of OBJROOT can be set to ${SRCTOP:H}/obj/ instead via src-env.conf (set by SRC_ENV_CONF) or environment. For environment it must be single quoted or escaped. This will be more likely for vendors who are building images or using NFS for builds. In those cases MAKEOBJDIRPREFIX may already be utilized and is supported. Discussed with: imp 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 13b008d751c9..29b9687ae931 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -31,7 +31,7 @@ SB_OBJROOT ?= ${SB}/obj/ # this is what we use below OBJROOT ?= ${SB_OBJROOT} .endif -OBJROOT ?= ${SRCTOP:H}/obj/ +OBJROOT ?= /usr/obj/${SRCTOP}/ .if ${OBJROOT:M*/} != "" OBJROOT:= ${OBJROOT:H:tA}/ .else -- 2.39.5