From owner-svn-src-projects@FreeBSD.ORG Wed Jun 10 13:08:46 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C3D0A4B; Wed, 10 Jun 2015 13:08:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2AA7D1CCA; Wed, 10 Jun 2015 13:08:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5AD8kuf001702; Wed, 10 Jun 2015 13:08:46 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5AD8kOu001701; Wed, 10 Jun 2015 13:08:46 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506101308.t5AD8kOu001701@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Wed, 10 Jun 2015 13:08:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r284219 - projects/bmake 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.20 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: Wed, 10 Jun 2015 13:08:46 -0000 Author: sjg Date: Wed Jun 10 13:08:45 2015 New Revision: 284219 URL: https://svnweb.freebsd.org/changeset/base/284219 Log: Since sys.mk now handles META_MODE and META_FILES options we need not worry about them here. Checking for .PARSEDIR no longer needed. Modified: projects/bmake/Makefile Modified: projects/bmake/Makefile ============================================================================== --- projects/bmake/Makefile Wed Jun 10 12:42:30 2015 (r284218) +++ projects/bmake/Makefile Wed Jun 10 13:08:45 2015 (r284219) @@ -521,26 +521,22 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT -.if defined(.PARSEDIR) # This makefile does not run in meta mode .MAKE.MODE= normal # Normally the things we run from here don't either. -# Using -DWITH_META_FILES -DWITHOUT_STAGING +# Using -DWITH_META_FILES # we can buildworld with meta files created which are useful # for debugging, but without any of the rest of a meta mode build. -.ifndef WITH_META_FILES -WITHOUT_META_MODE= -.export WITHOUT_META_MODE -.else -WITHOUT_STAGING= -UPDATE_DEPENDFILE=NO -.export UPDATE_DEPENDFILE WITHOUT_STAGING -.endif +MK_META_MODE= no +MK_STAGING= no +# tell meta.autodep.mk to not even think about updating anything. +UPDATE_DEPENDFILE= NO +.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE .if make(universe) # we do not want a failure of one branch abort all. MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif -.endif -.endif + +.endif # META_MODE