Date: Tue, 14 Jun 2016 16:20:11 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301886 - head/share/mk Message-ID: <201606141620.u5EGKB8h008275@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Jun 14 16:20:11 2016 New Revision: 301886 URL: https://svnweb.freebsd.org/changeset/base/301886 Log: WITH_META_MODE: Set MK_META_MODE=no with -B. Using -B already sets .MAKE.MODE=compat but it was leaving MK_META_MODE set which could still cause other MK_META_MODE==yes checks to trigger. Approved by: re (implicit) Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Tue Jun 14 16:20:08 2016 (r301885) +++ head/share/mk/sys.mk Tue Jun 14 16:20:11 2016 (r301886) @@ -42,9 +42,14 @@ __ENV_ONLY_OPTIONS:= \ .include <bsd.mkopt.mk> +# Disable MK_META_MODE with make -B +.if ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS) && ${.MAKEFLAGS:M-B} +MK_META_MODE= no +.endif + .if ${MK_DIRDEPS_BUILD} == "yes" .sinclude <meta.sys.mk> -.elif ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS) && ${.MAKEFLAGS:M-B} == "" +.elif ${MK_META_MODE} == "yes" # verbose will show .MAKE.META.PREFIX for each target. META_MODE+= meta verbose .if !defined(NO_META_MISSING)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606141620.u5EGKB8h008275>