diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-10-31 01:45:14 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-10-31 01:45:14 +0000 |
| commit | 601594ed6a89c1574ec332ee6b1e935172bab031 (patch) | |
| tree | 4cb901d73c5a25433aedc36a86c7aed8793af69f /Makefile.inc1 | |
| parent | ae160963d8f5dd59e0cae72a44ac546155841efc (diff) | |
| download | src-test2-601594ed6a89c1574ec332ee6b1e935172bab031.tar.gz src-test2-601594ed6a89c1574ec332ee6b1e935172bab031.zip | |
cleanworld: No need to cleandir if MK_AUTO_OBJ is enabled.
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=325193
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index de877a61c599..516e84359559 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2752,7 +2752,8 @@ builddtb: .PHONY # # 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 -# 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} cleanworld: .PHONY @@ -2761,10 +2762,12 @@ cleanworld: .PHONY -chflags -R 0 ${BW_CANONICALOBJDIR} rm -rf ${BW_CANONICALOBJDIR}/* .endif +.if ${MK_AUTO_OBJ} == "no" .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} # To be safe in this case, fall back to a 'make cleandir' ${_+_}@cd ${.CURDIR}; ${MAKE} cleandir .endif +.endif .if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH} XDEV_CPUTYPE?=${CPUTYPE} |