Date: Wed, 10 Jun 2015 13:08:46 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r284219 - projects/bmake Message-ID: <201506101308.t5AD8kOu001701@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506101308.t5AD8kOu001701>