From owner-svn-src-head@freebsd.org Thu Jan 7 00:20:49 2016 Return-Path: Delivered-To: svn-src-head@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 3EBC3A651CB; Thu, 7 Jan 2016 00:20:49 +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 EA5B319AF; Thu, 7 Jan 2016 00:20:48 +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 u070Kmr8060289; Thu, 7 Jan 2016 00:20:48 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u070KlJC060287; Thu, 7 Jan 2016 00:20:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201601070020.u070KlJC060287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 7 Jan 2016 00:20:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r293288 - in head: . share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2016 00:20:49 -0000 Author: bdrewery Date: Thu Jan 7 00:20:47 2016 New Revision: 293288 URL: https://svnweb.freebsd.org/changeset/base/293288 Log: Revert r293286. It was not intended to come in yet. Modified: head/Makefile head/share/mk/sys.mk Modified: head/Makefile ============================================================================== --- head/Makefile Thu Jan 7 00:19:30 2016 (r293287) +++ head/Makefile Thu Jan 7 00:20:47 2016 (r293288) @@ -143,6 +143,13 @@ TGTS+= ${BITGTS} PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj +_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ + -f /dev/null -V MAKEOBJDIRPREFIX dummy +.if !empty(_MAKEOBJDIRPREFIX) +.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ + (in make.conf(5)) or command-line variable. +.endif # We often need to use the tree's version of make to build it. # Choices add to complexity though. Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Thu Jan 7 00:19:30 2016 (r293287) +++ head/share/mk/sys.mk Thu Jan 7 00:20:47 2016 (r293288) @@ -33,13 +33,6 @@ __ENV_ONLY_OPTIONS:= \ ${__DEFAULT_YES_OPTIONS} \ ${__DEFAULT_DEPENDENT_OPTIONS:H} -__ENV_ONLY_VARS= \ - MAKEOBJDIR \ - MAKEOBJDIRPREFIX -.for _var in ${__ENV_ONLY_VARS} -_pre_includes_${_var:tl}:= ${${_var}:U__null} -.endfor - # early include for customization # see local.sys.mk below # Not included when building in fmake compatibility mode (still needed @@ -57,9 +50,6 @@ _pre_includes_${_var:tl}:= ${${_var}:U__ .endif .endif .if ${MK_AUTO_OBJ} == "yes" -# Reset, since it is allowed to be set from src-env.conf included before this. -_pre_includes_makeobjdirprefix:= ${MAKEOBJDIRPREFIX:U__null} -_pre_includes_makeobjdir:= ${MAKEOBJDIR:U__null} # This needs to be done early - before .PATH is computed # Don't do this for 'make showconfig' as it enables all options where meta mode # is not expected. @@ -420,15 +410,6 @@ __MAKE_SHELL?=/bin/sh path=${__MAKE_SHELL} .endif -# Ensure MAKEOBJDIRPREFIX was not incorrectly set. -.for _var in ${__ENV_ONLY_VARS} -.if ${.MAKEOVERRIDES:M${_var}} || (defined(${_var}) && \ - ${${_var}} != ${_pre_includes_${_var:tl}}) -.error ${_var} can only be set in environment, not as a global (in make.conf(5)) or command-line variable. -.endif -.undef _pre_includes_${_var:tl} -.endfor - # Hack for ports compatibility. Historically, ports makefiles have # assumed they can examine MACHINE_CPU without including anything # because this was automatically included in sys.mk. For /usr/src,