From owner-svn-src-projects@FreeBSD.ORG  Sat May 30 17:29:52 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D1C18855;
 Sat, 30 May 2015 17:29:52 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BF0C2169C;
 Sat, 30 May 2015 17:29:52 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4UHTqUN014092;
 Sat, 30 May 2015 17:29:52 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4UHTqhI014091;
 Sat, 30 May 2015 17:29:52 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201505301729.t4UHTqhI014091@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 30 May 2015 17:29:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r283776 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 May 2015 17:29:52 -0000

Author: sjg
Date: Sat May 30 17:29:51 2015
New Revision: 283776
URL: https://svnweb.freebsd.org/changeset/base/283776

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

Modified:
  projects/bmake/share/mk/bsd.progs.mk

Modified: projects/bmake/share/mk/bsd.progs.mk
==============================================================================
--- projects/bmake/share/mk/bsd.progs.mk	Sat May 30 17:27:52 2015	(r283775)
+++ projects/bmake/share/mk/bsd.progs.mk	Sat May 30 17:29:51 2015	(r283776)
@@ -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