d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'make clean all' to work again.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2017-06-20 20:52:06 +00:00
parent 00bc472686
commit 05f3e1fe94
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/bsd.dep.mk
View File

@ -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

5
share/mk/bsd.init.mk
View File

@ -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