Author: bdrewery
Date: Tue Apr 7 19:44:40 2020
New Revision: 359715
URL: https://svnweb.freebsd.org/changeset/base/359715
Log:
MFC r349729:
Consider *clean targets as non-build targets as well.
Modified:
stable/11/share/mk/bsd.init.mk
stable/11/share/mk/bsd.sys.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.init.mk
==============================================================================
--- stable/11/share/mk/bsd.init.mk Tue Apr 7 19:44:37 2020
(r359714)
+++ stable/11/share/mk/bsd.init.mk Tue Apr 7 19:44:40 2020
(r359715)
@@ -46,11 +46,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} || \
make(obj) || make(analyze) || make(print-dir)
# Skip building, but don't show a warning.
Modified: stable/11/share/mk/bsd.sys.mk
==============================================================================
--- stable/11/share/mk/bsd.sys.mk Tue Apr 7 19:44:37 2020
(r359714)
+++ stable/11/share/mk/bsd.sys.mk Tue Apr 7 19:44:40 2020
(r359715)
@@ -244,7 +244,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-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"
