From 409bf2b0975e765f7df2719bde0caf45975be08b Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 26 May 2016 23:20:20 +0000
Subject: [PATCH] DIRDEPS_BUILD: Don't show finished stats, which confuses
 crunchgen(1).

It would show 'make error:' lines for each auto object directory created.

Sponsored by:	EMC / Isilon Storage Division
---
 share/mk/bsd.crunchgen.mk  | 7 ++++---
 share/mk/local.meta.sys.mk | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk
index 4ac5d505189..b15155061f4 100644
--- a/share/mk/bsd.crunchgen.mk
+++ b/share/mk/bsd.crunchgen.mk
@@ -103,11 +103,12 @@ ${CONF}: Makefile
 .endfor
 
 CRUNCHGEN?= crunchgen
-CRUNCHENV?= MK_TESTS=no
+CRUNCHENV?= MK_TESTS=no \
+	    _RECURSING_CRUNCH=1
 .ORDER: ${OUTPUTS} objs
 ${OUTPUTS}: ${CONF} .META
-	MAKE=${MAKE} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${CRUNCHGEN} -fq \
-	    -m ${OUTMK} -c ${OUTC} ${CONF}
+	MAKE=${MAKE} ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
+	    ${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF}
 
 # These 2 targets cannot use .MAKE since they depend on the generated
 # ${OUTMK} above.
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index 2c69a641814..b457f0b29eb 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -214,7 +214,7 @@ CSU_DIR := ${CSU_DIR.${MACHINE_ARCH}}
 .if !empty(TIME_STAMP)
 TRACER= ${TIME_STAMP} ${:U}
 .endif
-.if !defined(_RECURSING_PROGS)
+.if !defined(_RECURSING_PROGS) && !defined(_RECURSING_CRUNCH)
 WITH_META_STATS= t
 .endif
 
-- 
2.45.2