KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 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
Download Patch File Download Diff File Expand all files Collapse all files
share/mk/bsd.dep.mk
+1 -1
View File
@@ -90,7 +90,7 @@ _meta_filemon= 1
.if defined(_SKIP_BUILD) || defined(_meta_filemon) .if defined(_SKIP_BUILD) || defined(_meta_filemon)
_SKIP_READ_DEPEND= 1 _SKIP_READ_DEPEND= 1
.if ${MK_DIRDEPS_BUILD} == "no" || make(analyze) || make(print-dir) || \ .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 .MAKE.DEPENDFILE= /dev/null
.endif .endif
.endif .endif
share/mk/bsd.init.mk
+3 -2
View File
@@ -50,8 +50,9 @@ $xGRP= ${_gid}
_SKIP_BUILD= not building at level 0 _SKIP_BUILD= not building at level 0
.elif !empty(.MAKEFLAGS:M-V${_V_DO_BUILD}) || \ .elif !empty(.MAKEFLAGS:M-V${_V_DO_BUILD}) || \
${.TARGETS:M*install*} == ${.TARGETS} || \ ${.TARGETS:M*install*} == ${.TARGETS} || \
make(clean*) || make(obj) || make(analyze) || make(print-dir) || \ ${.TARGETS:Mclean*} == ${.TARGETS} || \
make(destroy*) ${.TARGETS:Mdestroy*} == ${.TARGETS} || \
make(obj) || make(analyze) || make(print-dir)
# Skip building, but don't show a warning. # Skip building, but don't show a warning.
_SKIP_BUILD= _SKIP_BUILD=
.endif .endif