Author: bdrewery
Date: Tue Jul 25 16:46:12 2017
New Revision: 321485
URL: https://svnweb.freebsd.org/changeset/base/321485
Log:
Allow -DNO_SKIP_DEPEND to override the _SKIP_DEPEND logic.
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
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 Tue Jul 25 16:21:22 2017 (r321484)
+++ head/share/mk/bsd.dep.mk Tue Jul 25 16:46:12 2017 (r321485)
@@ -88,7 +88,7 @@ _meta_filemon= 1
# Also skip generating or including .depend.* files if in meta+filemon mode
# since it will track dependencies itself. OBJS_DEPEND_GUESS is still used
# for _meta_filemon but not for _SKIP_DEPEND.
-.if defined(_SKIP_BUILD)
+.if !defined(NO_SKIP_DEPEND) && defined(_SKIP_BUILD)
_SKIP_DEPEND= 1
.endif
.if ${MK_DIRDEPS_BUILD} == "no"
Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk Tue Jul 25 16:21:22 2017 (r321484)
+++ head/sys/conf/kern.post.mk Tue Jul 25 16:46:12 2017 (r321485)
@@ -201,9 +201,9 @@ _meta_filemon= 1
# Also skip generating or including .depend.* files if in meta+filemon mode
# since it will track dependencies itself. OBJS_DEPEND_GUESS is still used
# for _meta_filemon but not for _SKIP_DEPEND.
-.if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(*obj) || \
+.if !defined(NO_SKIP_DEPEND) && (make(*obj) || \
${.TARGETS:M*clean*} == ${.TARGETS} || \
- ${.TARGETS:M*install*} == ${.TARGETS}
+ ${.TARGETS:M*install*} == ${.TARGETS})
_SKIP_DEPEND= 1
.endif
.if defined(_SKIP_DEPEND) || defined(_meta_filemon)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
