svn commit: r296238 - in head: share/mk sys/conf

[Bryan Drewery]

Author: bdrewery
Date: Mon Feb 29 21:10:47 2016
New Revision: 296238
URL: https://svnweb.freebsd.org/changeset/base/296238

Log:
  FAST_DEPEND: Prefer .OBJDIR depend files.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.dep.mk
  head/sys/conf/kern.post.mk

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Mon Feb 29 21:09:09 2016	(r296237)
+++ head/share/mk/bsd.dep.mk	Mon Feb 29 21:10:47 2016	(r296238)
@@ -200,7 +200,7 @@ CFLAGS+=	${DEPEND_CFLAGS}
 .endif
 .if !defined(_SKIP_READ_DEPEND)
 .for __depend_obj in ${DEPENDFILES_OBJS}
-.sinclude "${__depend_obj}"
+.sinclude "${.OBJDIR}/${__depend_obj}"
 .endfor
 .endif	# !defined(_SKIP_READ_DEPEND)
 .endif	# !defined(_meta_filemon)

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Mon Feb 29 21:09:09 2016	(r296237)
+++ head/sys/conf/kern.post.mk	Mon Feb 29 21:10:47 2016	(r296238)
@@ -244,7 +244,7 @@ CFLAGS+=	${DEPEND_CFLAGS}
 .endif
 .if !defined(_SKIP_READ_DEPEND)
 .for __depend_obj in ${DEPENDFILES_OBJS}
-.sinclude "${__depend_obj}"
+.sinclude "${.OBJDIR}/${__depend_obj}"
 .endfor
 .endif	# !defined(_SKIP_READ_DEPEND)
 .endif	# !defined(_meta_filemon)