From a2835556e906d6229b1c67b43a4c307a137cb7ed Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 25 Feb 2016 20:02:42 +0000 Subject: [PATCH] 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 --- share/mk/bsd.dep.mk | 1 - share/mk/bsd.own.mk | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 3330ae0fd841..c1e1fc99a643 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 9f33424cae20..18b332e7f3db 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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)