diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-11-09 23:36:57 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-11-09 23:36:57 +0000 |
| commit | 264ecbcdcde616242a571d8713157ea0efd91e5a (patch) | |
| tree | d728d6ff8f7362da9dcdd154bd80cd0f01fafff2 | |
| parent | d7fb1920af601dddc213390c95e86396907515e1 (diff) | |
| download | FreeBSD-src-264ecbcdcde616242a571d8713157ea0efd91e5a.zip FreeBSD-src-264ecbcdcde616242a571d8713157ea0efd91e5a.tar.gz | |
Fix 'make cleanworld' to respect TARGET/TARGET_ARCH for cross-build objtrees.
This simplifies the logic to always try removing the objdir if it exists
and to fallback on a 'cleandir' if no objdir exists. The reasoning for
this is to avoid rm -rf src/* (r126024)
Sponsored by: EMC / Isilon Storage Division
MFC after: 2 weeks
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d6942f0..50a0f8b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2219,20 +2219,16 @@ builddtb: # created by bsd.obj.mk, except that we don't want to .include that file # in this makefile. # -BW_CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} +BW_CANONICALOBJDIR:=${OBJTREE}${.CURDIR} cleanworld: .PHONY -.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} .if exists(${BW_CANONICALOBJDIR}/) -rm -rf ${BW_CANONICALOBJDIR}/* -chflags -R 0 ${BW_CANONICALOBJDIR} rm -rf ${BW_CANONICALOBJDIR}/* .endif +.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} # To be safe in this case, fall back to a 'make cleandir' ${_+_}@cd ${.CURDIR}; ${MAKE} cleandir -.else - -rm -rf ${.OBJDIR}/* - -chflags -R 0 ${.OBJDIR} - rm -rf ${.OBJDIR}/* .endif .if defined(TARGET) && defined(TARGET_ARCH) |
