Date: Mon, 4 Dec 2017 09:14:58 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Warner Losh <imp@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r326535 - head/tools/boot Message-ID: <201712041714.vB4HEwpd046935@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201712041638.vB4GcK0q087528@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[ Charset UTF-8 unsupported, converting... ] > Author: imp > Date: Mon Dec 4 16:38:20 2017 > New Revision: 326535 > URL: https://svnweb.freebsd.org/changeset/base/326535 > > Log: > Just use the last line of the output from getting .OBJDIR. The > buildenv target prints other stuff too that needs to be ignored. > > Sponsored by: Netflix > > Modified: > head/tools/boot/universe.sh > > Modified: head/tools/boot/universe.sh > ============================================================================== > --- head/tools/boot/universe.sh Mon Dec 4 15:28:07 2017 (r326534) > +++ head/tools/boot/universe.sh Mon Dec 4 16:38:20 2017 (r326535) > @@ -26,7 +26,7 @@ dobuild() > local opt=$3 > > echo -n "Building $ta ${opt} ... " > - objdir=$(make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -V .OBJDIR") > + objdir=$(make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -V .OBJDIR" | tail -1) > rm -rf ${objdir} > if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend" \ > > $lf 2>&1; then We should probably find a better way than this, that is a very error prone mechanism to use. And given your gona run an rm -rf on the return value very dangerious if wrong. Something like adding a QUIET=true to buildenv so that it only outputs the desired value? Or having buildenv have options to directly output your desired .OBJDIR value? -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712041714.vB4HEwpd046935>