From owner-svn-src-projects@FreeBSD.ORG Tue Jun 4 15:25:58 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 587F8D5D; Tue, 4 Jun 2013 15:25:58 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4B57618C4; Tue, 4 Jun 2013 15:25:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54FPwiC044447; Tue, 4 Jun 2013 15:25:58 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54FPw9X044446; Tue, 4 Jun 2013 15:25:58 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201306041525.r54FPw9X044446@svn.freebsd.org> From: "Simon J. Gerraty" Date: Tue, 4 Jun 2013 15:25:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r251379 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 15:25:58 -0000 Author: sjg Date: Tue Jun 4 15:25:57 2013 New Revision: 251379 URL: http://svnweb.freebsd.org/changeset/base/251379 Log: Include more stuff within the meta mode block, so that buildworld can function normally. Submitted by: John Van Horne Modified: projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Tue Jun 4 14:38:50 2013 (r251378) +++ projects/bmake/share/mk/local.sys.mk Tue Jun 4 15:25:57 2013 (r251379) @@ -227,11 +227,6 @@ UPDATE_DEPENDFILE= NO .MAKE.META.BAILIWICK = ${SB} ${OBJROOT} ${STAGE_ROOT} -.endif # meta mode - -# ensure we have a value -.MAKE.MODE ?= normal - # don't rely on MACHINE_ARCH being set or valid MACHINE_ARCH.host = ${_HOST_ARCH} @@ -242,6 +237,11 @@ CSU_DIR.i386 = csu/i386-elf CSU_DIR.${MACHINE_ARCH} ?= csu/${MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${MACHINE_ARCH}} +.endif # meta mode + +# ensure we have a value +.MAKE.MODE ?= normal + MAKE_PRINT_VAR_ON_ERROR+= \ .CURDIR \ .MAKE \