aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-06-14 16:20:11 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-06-14 16:20:11 +0000
commit37250e4856c6239c03b99cb36cd21e25a5800f08 (patch)
tree9becec4e3508924a1bda9b5684409d0316b0f886
parent341d14b4040eb88ad1ee92a581506bfcde728e71 (diff)
downloadsrc-37250e4856c6239c03b99cb36cd21e25a5800f08.tar.gz
src-37250e4856c6239c03b99cb36cd21e25a5800f08.zip
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
Notes
Notes: svn path=/head/; revision=301886
-rw-r--r--share/mk/sys.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index d52ba21e6890..e103fddddbfa 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -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)