svn commit: r300801 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu May 26 23:20:20 2016
New Revision: 300801
URL: https://svnweb.freebsd.org/changeset/base/300801

Log:
  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

Modified:
  head/share/mk/bsd.crunchgen.mk
  head/share/mk/local.meta.sys.mk

Modified: head/share/mk/bsd.crunchgen.mk
==============================================================================
--- head/share/mk/bsd.crunchgen.mk	Thu May 26 23:20:17 2016	(r300800)
+++ head/share/mk/bsd.crunchgen.mk	Thu May 26 23:20:20 2016	(r300801)
@@ -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.

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Thu May 26 23:20:17 2016	(r300800)
+++ head/share/mk/local.meta.sys.mk	Thu May 26 23:20:20 2016	(r300801)
@@ -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