Date: Fri, 3 Nov 2017 16:32:22 -0600 From: Warner Losh <imp@bsdimp.com> To: Bryan Drewery <bdrewery@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r325116 - head Message-ID: <CANCZdfpXuLkS843%2BjneBzCYCsM5ZvV_Tm=zxzt73-wiD3C2%2BLg@mail.gmail.com> In-Reply-To: <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org> References: <201710300312.v9U3CcCT021416@repo.freebsd.org> <8d9e9f50-035c-403c-3bc5-6788b7a94dea@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery <bdrewery@freebsd.org> wrote: > On 10/29/2017 8:12 PM, Warner Losh wrote: > > Author: imp > > Date: Mon Oct 30 03:12:38 2017 > > New Revision: 325116 > > URL: https://svnweb.freebsd.org/changeset/base/325116 > > > > Log: > > Return proper status from buildenv. > > > > make buildenv BUILDENV_SHELL=<some command> more useful. Remove '|| > > true' from the command line so that errors are properly > > returned. There appears to be no reason for it, and it dates back to > > the original commit by ru@. > > > > Sponsored by: Netflix > > Now simply running 'make buildenv' and 'exit' throws a make error. > > Perhaps we need a BUILDENV_CMDS that does what you want and we otherwise > leave the ${BUILDENV_SHELL} || true handling. Are you sure? 4:29pm zooty:[242]> make buildenv Entering world for amd64:amd64 $ exit 4:29pm zooty:[243]> Perhaps you can give me an example that causes that? This was the very first thing I checked before committing the fix... Warner > > > > Modified: > > head/Makefile.inc1 > > > > Modified: head/Makefile.inc1 > > ============================================================ > ================== > > --- head/Makefile.inc1 Mon Oct 30 03:12:34 2017 (r325115) > > +++ head/Makefile.inc1 Mon Oct 30 03:12:38 2017 (r325116) > > @@ -991,8 +991,7 @@ buildenv: .PHONY > > .if ${BUILDENV_SHELL:M*zsh*} > > @echo For ZSH you must run: export CPUTYPE=${TARGET_CPUTYPE} > > .endif > > - @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 > ${BUILDENV_SHELL} \ > > - || true > > + @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} > > > > TOOLCHAIN_TGTS= ${WMAKE_TGTS:Neverything:Nbuild${libcompat}} > > toolchain: ${TOOLCHAIN_TGTS} .PHONY > > > > > -- > Regards, > Bryan Drewery > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpXuLkS843%2BjneBzCYCsM5ZvV_Tm=zxzt73-wiD3C2%2BLg>