Author: bdrewery
Date: Thu Jul 4 14:51:44 2019
New Revision: 349729
URL: https://svnweb.freebsd.org/changeset/base/349729
Log:
Consider *clean targets as non-build targets as well.
MFC after: 2 weeks
Sponsored by: DellEMC
Modified:
head/share/mk/bsd.init.mk
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.init.mk
==============================================================================
--- head/share/mk/bsd.init.mk Thu Jul 4 14:15:04 2019 (r349728)
+++ head/share/mk/bsd.init.mk Thu Jul 4 14:51:44 2019 (r349729)
@@ -58,11 +58,12 @@ $xGRP= ${_gid}
# things like 'make all install' or 'make foo install'.
# - non-build targets are called
.if ${MK_DIRDEPS_BUILD} == "yes" && ${.MAKE.LEVEL:U1} == 0 && \
- ${BUILD_AT_LEVEL0:Uyes:tl} == "no" && !make(clean*)
+ ${BUILD_AT_LEVEL0:Uyes:tl} == "no" && !make(clean*) && !make(*clean)
_SKIP_BUILD= not building at level 0
.elif !empty(.MAKEFLAGS:M-V${_V_DO_BUILD}) || \
${.TARGETS:M*install*} == ${.TARGETS} || \
${.TARGETS:Mclean*} == ${.TARGETS} || \
+ ${.TARGETS:M*clean} == ${.TARGETS} || \
${.TARGETS:Mdestroy*} == ${.TARGETS} || \
${.TARGETS:Mobj} == ${.TARGETS} || \
make(analyze) || make(print-dir)
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Thu Jul 4 14:15:04 2019 (r349728)
+++ head/share/mk/bsd.sys.mk Thu Jul 4 14:51:44 2019 (r349729)
@@ -284,7 +284,7 @@ PHONY_NOTMAIN = analyze afterdepend afterinstall all b
.NOTMAIN: ${PHONY_NOTMAIN:Nall}
.if ${MK_STAGING} != "no"
-.if defined(_SKIP_BUILD) || (!make(all) && !make(clean*))
+.if defined(_SKIP_BUILD) || (!make(all) && !make(clean*) && !make(*clean))
_SKIP_STAGING?= yes
.endif
.if ${_SKIP_STAGING:Uno} == "yes"
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
