amd64/144405: [build] [patch] include /usr/obj/lib32 in cleanworld target on amd64 arch

[Anonymous]

The following reply was made to PR amd64/144405; it has been noted by GNATS.

From: Anonymous <swell.k at gmail.com>
To: Alexander Best <alexbestms at wwu.de>
Cc: bug-followup at FreeBSD.org
Subject: Re: amd64/144405: [build] [patch] include /usr/obj/lib32 in cleanworld target on amd64 arch
Date: Fri, 16 Jul 2010 02:12:28 +0400

 What do you think about respecting WITHOUT_LIB32 and TARGET?
 
 --- a.diff begins here ---
 diff --git a/Makefile b/Makefile
 index 5edb4da..7d261c3 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -157,9 +157,7 @@ cleanworld:
  	#   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}/*
 +	${_+_}@cd ${.CURDIR}; ${_MAKE} cleanworld
  .endif
  
  #
 diff --git a/Makefile.inc1 b/Makefile.inc1
 index d939280..0b9981d 100644
 --- a/Makefile.inc1
 +++ b/Makefile.inc1
 @@ -1508,3 +1503,15 @@ builddtb:
  	dtc -O dtb -o \
  	    ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
  	    -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
 +
 +cleanworld:
 +.if exists(${OBJTREE}${.CURDIR})
 +	-rm -rf ${OBJTREE}${.CURDIR}/*
 +	-chflags -R 0 ${OBJTREE}${.CURDIR}
 +	rm -rf ${OBJTREE}${.CURDIR}/*
 +.endif
 +.if exists(${OBJTREE}/lib32${.CURDIR}) && ${MK_LIB32} != "no"
 +	-rm -rf ${OBJTREE}/lib32${.CURDIR}/*
 +	-chflags -R 0 ${OBJTREE}/lib32${.CURDIR}
 +	rm -rf ${OBJTREE}/lib32${.CURDIR}/*
 +.endif
 --- a.diff ends here ---