Date: Sun, 18 Jul 2010 23:40:13 GMT From: Alexander Best <alexbestms@uni-muenster.de> To: freebsd-amd64@FreeBSD.org Subject: Re: amd64/144405: [build] [patch] include /usr/obj/lib32 in cleanworld target on amd64 arch Message-ID: <201007182340.o6INeDht060392@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR amd64/144405; it has been noted by GNATS.
From: Alexander Best <alexbestms@uni-muenster.de>
To: Anonymous <swell.k@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: amd64/144405: [build] [patch] include /usr/obj/lib32 in
cleanworld target on amd64 arch
Date: Mon, 19 Jul 2010 01:36:23 +0200
2010/7/16 Anonymous <swell.k@gmail.com>:
> What do you think about respecting WITHOUT_LIB32 and TARGET?
i like it. i'm not sure however if WITHOUT_LIB32 should have an impact
on cleandir/cleanworld.
if i remember correctly running target clean e.g. also doesn't skip
certain directories in the tree even if the user has set WITHOUT_* and
doesn't want specific code to be built. i can't really think of a
situation where somebody wants to remove all the 64bit objs but keep
the 32bit ones.
alex
>
> --- a.diff begins here ---
> diff --git a/Makefile b/Makefile
> index 5edb4da..7d261c3 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -157,9 +157,7 @@ cleanworld:
> =A0 =A0 =A0 =A0# =A0 To be safe in this case, fall back to a 'make cleand=
ir'
> =A0 =A0 =A0 =A0${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir
> =A0.else
> - =A0 =A0 =A0 -rm -rf ${.OBJDIR}/*
> - =A0 =A0 =A0 -chflags -R 0 ${.OBJDIR}
> - =A0 =A0 =A0 rm -rf ${.OBJDIR}/*
> + =A0 =A0 =A0 ${_+_}@cd ${.CURDIR}; ${_MAKE} cleanworld
> =A0.endif
>
> =A0#
> diff --git a/Makefile.inc1 b/Makefile.inc1
> index d939280..0b9981d 100644
> --- a/Makefile.inc1
> +++ b/Makefile.inc1
> @@ -1508,3 +1503,15 @@ builddtb:
> =A0 =A0 =A0 =A0dtc -O dtb -o \
> =A0 =A0 =A0 =A0 =A0 =A0${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -=
f1`.dtb -b 0 \
> =A0 =A0 =A0 =A0 =A0 =A0-p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE=
}
> +
> +cleanworld:
> +.if exists(${OBJTREE}${.CURDIR})
> + =A0 =A0 =A0 -rm -rf ${OBJTREE}${.CURDIR}/*
> + =A0 =A0 =A0 -chflags -R 0 ${OBJTREE}${.CURDIR}
> + =A0 =A0 =A0 rm -rf ${OBJTREE}${.CURDIR}/*
> +.endif
> +.if exists(${OBJTREE}/lib32${.CURDIR}) && ${MK_LIB32} !=3D "no"
> + =A0 =A0 =A0 -rm -rf ${OBJTREE}/lib32${.CURDIR}/*
> + =A0 =A0 =A0 -chflags -R 0 ${OBJTREE}/lib32${.CURDIR}
> + =A0 =A0 =A0 rm -rf ${OBJTREE}/lib32${.CURDIR}/*
> +.endif
> --- a.diff ends here ---
>
--=20
Alexander Best
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007182340.o6INeDht060392>