Author: bdrewery
Date: Tue Jun 20 20:52:06 2017
New Revision: 320174
URL: https://svnweb.freebsd.org/changeset/base/320174
Log:
Fix 'make clean all' to work again.
This likely broke completely with r308599.
Apply the same fix for 'make destroy' which is a DIRDEPS_BUILD thing.
PR: 219819
Reported by: trasz
MFC after: 3 days
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/bsd.dep.mk
head/share/mk/bsd.init.mk
Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk Tue Jun 20 20:50:54 2017 (r320173)
+++ head/share/mk/bsd.dep.mk Tue Jun 20 20:52:06 2017 (r320174)
@@ -90,7 +90,7 @@ _meta_filemon= 1
.if defined(_SKIP_BUILD) || defined(_meta_filemon)
_SKIP_READ_DEPEND= 1
.if ${MK_DIRDEPS_BUILD} == "no" || make(analyze) || make(print-dir) || \
- make(obj) || make(clean*) || make(destroy*)
+ make(obj) || (!make(all) && (make(clean*) || make(destroy*)))
.MAKE.DEPENDFILE= /dev/null
.endif
.endif
Modified: head/share/mk/bsd.init.mk
==============================================================================
--- head/share/mk/bsd.init.mk Tue Jun 20 20:50:54 2017 (r320173)
+++ head/share/mk/bsd.init.mk Tue Jun 20 20:52:06 2017 (r320174)
@@ -50,8 +50,9 @@ $xGRP= ${_gid}
_SKIP_BUILD= not building at level 0
.elif !empty(.MAKEFLAGS:M-V${_V_DO_BUILD}) || \
${.TARGETS:M*install*} == ${.TARGETS} || \
- make(clean*) || make(obj) || make(analyze) || make(print-dir) || \
- make(destroy*)
+ ${.TARGETS:Mclean*} == ${.TARGETS} || \
+ ${.TARGETS:Mdestroy*} == ${.TARGETS} || \
+ make(obj) || make(analyze) || make(print-dir)
# Skip building, but don't show a warning.
_SKIP_BUILD=
.endif
_______________________________________________
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"
