svn commit: r296062 - head/share/mk

[Bryan Drewery]

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)