From owner-svn-src-head@freebsd.org  Thu Feb 25 20:02:44 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08245AB46D4;
 Thu, 25 Feb 2016 20:02:44 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CD691948;
 Thu, 25 Feb 2016 20:02:43 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1PK2gd9066729;
 Thu, 25 Feb 2016 20:02:42 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1PK2gOQ066727;
 Thu, 25 Feb 2016 20:02:42 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201602252002.u1PK2gOQ066727@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 25 Feb 2016 20:02:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296062 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2016 20:02:44 -0000

Author: bdrewery
Date: Thu Feb 25 20:02:42 2016
New Revision: 296062
URL: https://svnweb.freebsd.org/changeset/base/296062

Log:
  Fix build without FAST_DEPEND and without running 'make depend' after r295985.
  
  The OBJS_DEPEND_GUESS mechanism required moving the bsd.dep.mk inclusion
  to after the checks, but left DEPENDFILE not-yet-set.  Move it to
  bsd.own.mk to resolve this.
  
  Pointyhat to:	bdrewery
  Reported by:	antoine (ports failures)
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.dep.mk
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Thu Feb 25 20:02:30 2016	(r296061)
+++ head/share/mk/bsd.dep.mk	Thu Feb 25 20:02:42 2016	(r296062)
@@ -61,7 +61,6 @@ _MKDEPCC:=	${CC:N${CCACHE_BIN}}
 _MKDEPCC+=	${DEPFLAGS}
 .endif
 MKDEPCMD?=	CC='${_MKDEPCC}' mkdep
-DEPENDFILE?=	.depend
 .if ${MK_DIRDEPS_BUILD} == "no"
 .MAKE.DEPENDFILE= ${DEPENDFILE}
 .endif

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Thu Feb 25 20:02:30 2016	(r296061)
+++ head/share/mk/bsd.own.mk	Thu Feb 25 20:02:42 2016	(r296062)
@@ -257,6 +257,8 @@ XZ_CMD?=	xz
 # overriden by Makefiles, but the user may choose to set this in src.conf(5).
 TESTSBASE?= /usr/tests
 
+DEPENDFILE?=	.depend
+
 # Compat for the moment -- old bsd.own.mk only included this when _WITHOUT_SRCCONF
 # wasn't defined. bsd.ports.mk and friends depend on this behavior. Remove in 12.
 .if !defined(_WITHOUT_SRCCONF)