Date: Thu, 10 Feb 2011 13:22:00 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: John Baldwin <jhb@freebsd.org> Cc: Alexander Kabaev <kan@freebsd.org>, FreeBSD current mailing list <current@freebsd.org> Subject: Re: [PATCH] Add a 'make toolchains' target Message-ID: <20110210131731.P80258@maildrop.int.zabbadoz.net> In-Reply-To: <201102100813.13803.jhb@freebsd.org> References: <201102100813.13803.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 10 Feb 2011, John Baldwin wrote:
> This patch adds a 'make toolchains' target that invokes 'make toolchain' for
> each target. The use case I want it for is a cheaper way to just test kernels
> via make tinderbox so I can do:
>
> make toolchains
> make MAKE_JUST_KERNELS=yes tinderbox
>
> It is implemented by adding a new frob to tweak the target that make universe
> builds for the world stage of universe (UNIVERSE_TARGET). If that frob is
> set, then the kernel build step for a universe is skipped. With this, the
> toolchains target is a simple wrapper for:
>
> make UNIVERSE_TARGET=toolchains universe
>
> Index: Makefile
> ===================================================================
> --- Makefile (revision 218481)
> +++ Makefile (working copy)
> @@ -30,6 +30,7 @@
> # delete-old-libs - Delete obsolete libraries.
> # targets - Print a list of supported TARGET/TARGET_ARCH pairs
> # for world and kernel targets.
> +# toolchains - Build a toolchain for all world and kernel targets.
Should also go to build(7).
> # This makefile is simple by design. The FreeBSD make automatically reads
> # the /usr/share/mk/sys.mk unless the -m argument is specified on the
> @@ -307,9 +308,11 @@ make: .PHONY
> ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
>
> tinderbox:
> - @cd ${.CURDIR} && \
> - DOING_TINDERBOX=YES ${MAKE} JFLAG=${JFLAG} universe
> + @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
You lost th JFLAG again that you had lately added. On purpose?
> +toolchains:
> + @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
> +
> #
> # universe
> #
> @@ -328,6 +331,12 @@ TARGET_ARCHES_sun4v?= sparc64
> TARGET_ARCHES_${target}?= ${target}
> .endfor
>
> +.if defined(UNIVERSE_TARGET)
> +MAKE_JUST_WORLDS= YES
Not sure that's ideal but ok for a start; Eventually someone could think
that UNIVERSE_TARGET=kernels could replace the MAKE_JUST_KERNELS=yes.
With the current logic that however is almost impossible to do.
Call it UNIVERSE_WORLD_TARGET?
> +.else
> +UNIVERSE_TARGET?= buildworld
> +.endif
> +
> targets:
> @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
> .for target in ${TARGETS}
> @@ -361,16 +370,16 @@ universe_${target}_prologue:
> .for target_arch in ${TARGET_ARCHES_${target}}
> universe_${target}: universe_${target}_${target_arch}
> universe_${target}_${target_arch}: universe_${target}_prologue
> - @echo ">> ${target}.${target_arch} buildworld started on `LC_ALL=C date`"
> + @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C
> date`"
> @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
> - ${MAKE} ${JFLAG} buildworld \
> + ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
> TARGET=${target} \
> TARGET_ARCH=${target_arch} \
> - > _.${target}.${target_arch}.buildworld 2>&1 || \
> - (echo "${target}.${target_arch} world failed," \
> - "check _.${target}.${target_arch}.buildworld for details" | \
> + > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
> + (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \
> + "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
> ${MAKEFAIL}))
> - @echo ">> ${target}.${target_arch} buildworld completed on `LC_ALL=C
> date`"
> + @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on
> `LC_ALL=C date`"
> .endfor
> .endif
> .if !defined(MAKE_JUST_WORLDS)
>
>
--
Bjoern A. Zeeb You have to have visions!
Stop bit received. Insert coin for new address family.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110210131731.P80258>