svn commit: r248937 - head

[Garrett Cooper]

Awesome--thanks!
-Garrett

Sent from my iPhone

On Mar 30, 2013, at 7:03 PM, Andrew Turner <andrew at FreeBSD.org> wrote:

> Author: andrew
> Date: Sun Mar 31 02:03:34 2013
> New Revision: 248937
> URL: http://svnweb.freebsd.org/changeset/base/248937
> 
> Log:
>  When building universe ensure the required worlds are finished before
>  starting the kernels. Before this the kernels would be built as part of the
>  last architecture universe target. There can cause problems when this world
>  finishes before the other worlds as the host compiler may be picked up
>  rather than the target compiler.
> 
>  The solution is to add a target to build the universe kernels that depends
>  on all the world targets finishing. As we may not be building a world only
>  depend on it when MAKE_JUST_KERNELS is undefined.
> 
> Modified:
>  head/Makefile
> 
> Modified: head/Makefile
> ==============================================================================
> --- head/Makefile    Sat Mar 30 20:57:35 2013    (r248936)
> +++ head/Makefile    Sun Mar 31 02:03:34 2013    (r248937)
> @@ -392,6 +392,14 @@ universe_${target}_${target_arch}: unive
> .endfor
> .endif
> .if !defined(MAKE_JUST_WORLDS)
> +# If we are building world and kernels wait for the required worlds to finish
> +.if !defined(MAKE_JUST_KERNELS)
> +.for target_arch in ${TARGET_ARCHES_${target}}
> +universe_${target}_kernels: universe_${target}_${target_arch}
> +.endfor
> +.endif
> +universe_${target}: universe_${target}_kernels
> +universe_${target}_kernels: universe_${target}_prologue
> .if exists(${KERNSRCDIR}/${target}/conf/NOTES)
>    @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
>        ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"