Date: Tue, 16 Jun 2015 18:43:09 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284456 - head Message-ID: <201506161843.t5GIh9tX030268@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Tue Jun 16 18:43:08 2015 New Revision: 284456 URL: https://svnweb.freebsd.org/changeset/base/284456 Log: Add a universe_${target}_worlds target to simplify the logic to find when to start building kernels. Obtained from: ABT Systems Ltd Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Jun 16 18:39:11 2015 (r284455) +++ head/Makefile Tue Jun 16 18:43:08 2015 (r284456) @@ -438,9 +438,12 @@ universe_epilogue: universe_${target} universe_${target}: universe_${target}_prologue universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=C date`" +universe_${target}_worlds: + .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}: universe_${target}_${target_arch} +universe_${target}_worlds: universe_${target}_${target_arch} universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ @@ -456,13 +459,8 @@ universe_${target}_${target_arch}: unive .endif # !MAKE_JUST_KERNELS .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}_worlds universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506161843.t5GIh9tX030268>