summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-01-27 01:24:05 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-01-27 01:24:05 +0000
commit64d0bd295160c8cef670f9b055df3535eb015a7a (patch)
tree2bc68450814f670b12b6da80f303604f99954c81 /share
parent6c4255a1e633d69e779125ce66e6032a1abca475 (diff)
downloadFreeBSD-src-64d0bd295160c8cef670f9b055df3535eb015a7a.zip
FreeBSD-src-64d0bd295160c8cef670f9b055df3535eb015a7a.tar.gz
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
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.dep.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index d31dc8b..f7f475e 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -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'.
OpenPOWER on IntegriCloud