svn commit: r325194 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Tue Oct 31 02:12:09 2017
New Revision: 325194
URL: https://svnweb.freebsd.org/changeset/base/325194

Log:
  Disable MK_AUTO_OBJ as a make argument like r325078.
  
  This avoids needlessly trying to enable it opportunistically.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/bsd.crunchgen.mk

Modified: head/share/mk/bsd.crunchgen.mk
==============================================================================
--- head/share/mk/bsd.crunchgen.mk	Tue Oct 31 01:45:14 2017	(r325193)
+++ head/share/mk/bsd.crunchgen.mk	Tue Oct 31 02:12:09 2017	(r325194)
@@ -41,7 +41,7 @@ CRUNCHOBJS= ${.OBJDIR}
 CRUNCH_GENERATE_LINKS?= yes
 # Don't let the prog.mk use MK_AUTO_OBJ, but do let the component builds use
 # it.
-CRUNCHENV+= MK_AUTO_OBJ=no
+CRUNCHARGS+= MK_AUTO_OBJ=no
 CRUNCH_BUILDOPTS+= MK_AUTO_OBJ=${MK_AUTO_OBJ}
 
 CLEANFILES+= ${CONF} *.o *.lo *.c *.mk *.cache *.a *.h
@@ -114,7 +114,7 @@ CRUNCHENV+= MK_TESTS=no \
 ${OUTPUTS:[1]}: .META
 ${OUTPUTS:[2..-1]}: .NOMETA
 ${OUTPUTS}: ${CONF}
-	MAKE="${MAKE}" ${CRUNCHENV:NMK_AUTO_OBJ=*} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
+	MAKE="${MAKE}" ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
 	    MK_AUTO_OBJ=${MK_AUTO_OBJ} \
 	    ${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF}
 	# Avoid redundantly calling 'make objs' which we've done by our
@@ -127,21 +127,23 @@ ${PROG}: ${OUTPUTS} objs .NOMETA .PHONY
 	${CRUNCHENV} \
 	    CC="${CC} ${CFLAGS} ${LDFLAGS}" \
 	    CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" \
-	    ${MAKE} .MAKE.MODE="${.MAKE.MODE} curdirOk=yes" \
+	    ${MAKE} ${CRUNCHARGS} .MAKE.MODE="${.MAKE.MODE} curdirOk=yes" \
 	    .MAKE.META.IGNORE_PATHS="${.MAKE.META.IGNORE_PATHS}" \
 	    -f ${OUTMK} exe
 
 objs: ${OUTMK} .META
 	${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
-	    ${MAKE} -f ${OUTMK} BUILD_TOOLS_META=.NOMETA objs
+	    ${MAKE} -f ${OUTMK} ${CRUNCHARGS} BUILD_TOOLS_META=.NOMETA objs
 
 # <sigh> Someone should replace the bin/csh and bin/sh build-tools with
 # shell scripts so we can remove this nonsense.
 .for _tool in ${CRUNCH_BUILDTOOLS}
 build-tools-${_tool}:
 	${_+_}cd ${.CURDIR}/../../${_tool}; \
-	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \
-	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools
+	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} \
+	        ${CRUNCHARGS} obj; \
+	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} ${CRUNCHARGS} \
+	        build-tools
 build-tools: build-tools-${_tool}
 .endfor
 
@@ -155,6 +157,7 @@ build-tools: build-tools-${_tool}
 ${__target}_crunchdir_${P}: .PHONY .MAKE
 	${_+_}cd ${CRUNCH_SRCDIR_${P}} && \
 	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \
+	    ${CRUNCHARGS} \
 	    DIRPRFX=${DIRPRFX}${P}/ ${CRUNCH_BUILDOPTS} ${__target}
 ${__target}: ${__target}_crunchdir_${P}
 .endfor