cleanworld: No need to cleandir if MK_AUTO_OBJ is enabled.

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-10-31 01:45:14 +00:00
parent ae160963d8
commit 601594ed6a

View File

@ -2752,7 +2752,8 @@ builddtb: .PHONY
# #
# It is expected that BW_CANONICALOBJDIR == the CANONICALOBJDIR as would be # It is expected that BW_CANONICALOBJDIR == the CANONICALOBJDIR as would be
# created by bsd.obj.mk, except that we don't want to .include that file # created by bsd.obj.mk, except that we don't want to .include that file
# in this makefile. # in this makefile. We don't do a cleandir walk if MK_AUTO_OBJ is yes
# since it is not possible for files to land in the wrong place.
# #
BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR} BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR}
cleanworld: .PHONY cleanworld: .PHONY
@ -2761,10 +2762,12 @@ cleanworld: .PHONY
-chflags -R 0 ${BW_CANONICALOBJDIR} -chflags -R 0 ${BW_CANONICALOBJDIR}
rm -rf ${BW_CANONICALOBJDIR}/* rm -rf ${BW_CANONICALOBJDIR}/*
.endif .endif
.if ${MK_AUTO_OBJ} == "no"
.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
# To be safe in this case, fall back to a 'make cleandir' # To be safe in this case, fall back to a 'make cleandir'
${_+_}@cd ${.CURDIR}; ${MAKE} cleandir ${_+_}@cd ${.CURDIR}; ${MAKE} cleandir
.endif .endif
.endif
.if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH} .if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH}
XDEV_CPUTYPE?=${CPUTYPE} XDEV_CPUTYPE?=${CPUTYPE}