svn commit: r294872 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Wed Jan 27 01:24:05 2016
New Revision: 294872
URL: https://svnweb.freebsd.org/changeset/base/294872

Log:
  Fix DIRDEPS_BUILD after r294752.
  
  DIRDEPS_BUILD does not yet support PROGS having their own dependency
  file.
  
  Overriding .MAKE.DEPENDFILE here causes major problems with the meta
  mode logic since it creates the Makefile.depend as '.depend' resulting
  in infinite loops in make due to dirdeps.mk including .depend endlessly.
  
  X-MFC-With:	r294752
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

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

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Wed Jan 27 00:50:27 2016	(r294871)
+++ head/share/mk/bsd.dep.mk	Wed Jan 27 01:24:05 2016	(r294872)
@@ -56,7 +56,9 @@ _MKDEPCC+=	${DEPFLAGS}
 .endif
 MKDEPCMD?=	CC='${_MKDEPCC}' mkdep
 DEPENDFILE?=	.depend
+.if ${MK_DIRDEPS_BUILD} == "no"
 .MAKE.DEPENDFILE= ${DEPENDFILE}
+.endif
 DEPENDFILES=	${DEPENDFILE}
 
 # Keep `tags' here, before SRCS are mangled below for `depend'.