Date: Thu, 17 Sep 2015 04:22:01 +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: r287899 - head/share/mk Message-ID: <201509170422.t8H4M1tn079232@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Sep 17 04:22:00 2015 New Revision: 287899 URL: https://svnweb.freebsd.org/changeset/base/287899 Log: 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 Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Thu Sep 17 04:01:05 2015 (r287898) +++ head/share/mk/local.meta.sys.mk Thu Sep 17 04:22:00 2015 (r287899) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509170422.t8H4M1tn079232>