diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-14 16:20:11 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-14 16:20:11 +0000 |
| commit | 8c2481d2a9a14414aed0dd43a837221ecc5bf9c6 (patch) | |
| tree | 9becec4e3508924a1bda9b5684409d0316b0f886 | |
| parent | 885773a4b909fded392f44f207239837caace9f2 (diff) | |
| download | FreeBSD-src-8c2481d2a9a14414aed0dd43a837221ecc5bf9c6.zip FreeBSD-src-8c2481d2a9a14414aed0dd43a837221ecc5bf9c6.tar.gz | |
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
| -rw-r--r-- | share/mk/sys.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index d52ba21..e103fdd 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) |
