From owner-svn-src-all@freebsd.org Tue Oct 31 00:26:43 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94C4EE3A896; Tue, 31 Oct 2017 00:26:43 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7163E7D67C; Tue, 31 Oct 2017 00:26:43 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9V0QgSE055857; Tue, 31 Oct 2017 00:26:42 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V0Qg6C055855; Tue, 31 Oct 2017 00:26:42 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310026.v9V0Qg6C055855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:26:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325191 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325191 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Oct 2017 00:26:43 -0000 Author: bdrewery Date: Tue Oct 31 00:26:42 2017 New Revision: 325191 URL: https://svnweb.freebsd.org/changeset/base/325191 Log: Move some objdir handling (OBJROOT/OBJTOP) out of DIRDEPS_BUILD-only files. Sponsored by: Dell EMC Isilon Added: head/share/mk/src.sys.obj.mk (contents, props changed) Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Tue Oct 31 00:07:41 2017 (r325190) +++ head/share/mk/local.meta.sys.mk Tue Oct 31 00:26:42 2017 (r325191) @@ -7,36 +7,10 @@ # we need this until there is an alternative MK_INSTALL_AS_USER= yes -_default_makeobjdir=$${.CURDIR:S,^$${SRCTOP},$${OBJTOP},} +# Default OBJROOT/MAKEOBJDIR handled in local.sys.obj.mk +.include -.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 -.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) -# put things approximately where they want -OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP}/ -MAKEOBJDIRPREFIX= -.export MAKEOBJDIRPREFIX -.endif -.if empty(MAKEOBJDIR) -# OBJTOP set below -MAKEOBJDIR=${_default_makeobjdir} -# export but do not track -.export-env MAKEOBJDIR -# Expand for our own use -MAKEOBJDIR:= ${MAKEOBJDIR} -.endif -.if !empty(SB) -SB_OBJROOT ?= ${SB}/obj/ -# this is what we use below -OBJROOT ?= ${SB_OBJROOT} -.endif -OBJROOT ?= /usr/obj${SRCTOP}/ -.if ${OBJROOT:M*/} != "" -OBJROOT:= ${OBJROOT:H:tA}/ -.else -OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T} -.endif -.export OBJROOT SRCTOP - +.if !defined(HOST_TARGET) # we need HOST_TARGET etc below. .include .export HOST_TARGET Added: head/share/mk/src.sys.obj.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/mk/src.sys.obj.mk Tue Oct 31 00:26:42 2017 (r325191) @@ -0,0 +1,38 @@ +# $FreeBSD$ + +_default_makeobjdir= $${.CURDIR:S,^$${SRCTOP},$${OBJTOP},} + +.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 +.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) +# put things approximately where they want +OBJROOT:= ${MAKEOBJDIRPREFIX}${SRCTOP}/ +MAKEOBJDIRPREFIX= +.export MAKEOBJDIRPREFIX +.endif +.if empty(MAKEOBJDIR) +# OBJTOP set below +MAKEOBJDIR= ${_default_makeobjdir} +# export but do not track +.export-env MAKEOBJDIR +# Expand for our own use +MAKEOBJDIR:= ${MAKEOBJDIR} +.endif +.if !empty(SB) +SB_OBJROOT?= ${SB}/obj/ +# this is what we use below +OBJROOT?= ${SB_OBJROOT} +.endif +OBJROOT?= /usr/obj${SRCTOP}/ +.if ${OBJROOT:M*/} != "" +OBJROOT:= ${OBJROOT:H:tA}/ +.else +OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T} +.endif +.export OBJROOT SRCTOP +.endif + +.if defined(MAKEOBJDIR) +.if ${MAKEOBJDIR:M/*} == "" +.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' +.endif +.endif