From 58073855a49f4e8a80d8af85322f04638ff9b07f Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 30 May 2015 17:29:51 +0000
Subject: [PATCH] Do not override variables on command line that build needs to
 change.

It is sufficient to explicitly set DEPENDFILE in env for each sub-make.
---
 share/mk/bsd.progs.mk | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
index 46abbb3fc165..f943678a8ff7 100644
--- a/share/mk/bsd.progs.mk
+++ b/share/mk/bsd.progs.mk
@@ -62,8 +62,6 @@ UPDATE_DEPENDFILE ?= yes
 .endif
 UPDATE_DEPENDFILE ?= NO
 
-# ensure that we don't clobber each other's dependencies
-DEPENDFILE?= .depend.${PROG}
 # prog.mk will do the rest
 .else
 all: ${FILES} ${PROGS} ${SCRIPTS}
@@ -95,17 +93,17 @@ x.$p= PROG_CXX=$p
 .endif
 
 $p ${p}_p: .PHONY .MAKE
-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p \
-	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
-	    ${x.$p})
+	(cd ${.CURDIR} && \
+	    DEPENDFILE=.depend.$p \
+	    ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
+	    SUBDIR= PROG=$p ${x.$p})
 
 .for t in ${PROGS_TARGETS:O:u}
 $p.$t: .PHONY .MAKE
-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p \
-	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
-	    ${x.$p} ${@:E})
+	(cd ${.CURDIR} && \
+	    DEPENDFILE=.depend.$p \
+	    ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
+	    SUBDIR= PROG=$p ${x.$p} ${@:E})
 .endfor
 .endfor