Date: Tue, 16 Apr 2013 06:52:32 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r249535 - stable/8 Message-ID: <201304160652.r3G6qWDB038430@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Apr 16 06:52:32 2013 New Revision: 249535 URL: http://svnweb.freebsd.org/changeset/base/249535 Log: MFC r249316: Ensure make -j N universe works correctly, by checking for an up-to-date make before starting the universe targets themselves. Otherwise, all of the targets would attempt to build make simultaneously, overwriting each other's copies of the make object files and executable. This could lead to strange errors, for example when partially-written make executables are invoked. Also amend r216620, to make the rest of universe wait properly until the upgrade_checks target is finished, by adding universe_${target}_prologue to the .ORDER target. Otherwise, make will be too smart for its own good, and start building the universe targets simultaneously with the prologues anyway. Modified: stable/8/Makefile (contents, props changed) Modified: stable/8/Makefile ============================================================================== --- stable/8/Makefile Tue Apr 16 06:51:07 2013 (r249534) +++ stable/8/Makefile Tue Apr 16 06:52:32 2013 (r249535) @@ -300,7 +300,7 @@ MAKEFAIL=tee -a ${FAILFILE} MAKEFAIL=cat .endif -universe: universe_prologue +universe: universe_prologue upgrade_checks universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @@ -310,7 +310,7 @@ universe_prologue: .endif .for target in ${TARGETS} universe: universe_${target} -.ORDER: universe_prologue universe_${target} universe_epilogue +.ORDER: universe_prologue upgrade_checks universe_${target}_prologue universe_${target} universe_epilogue universe_${target}: @echo ">> ${target} started on `LC_ALL=C date`" .if !defined(MAKE_JUST_KERNELS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304160652.r3G6qWDB038430>