svn commit: r325116 - head

[Warner Losh]

On Fri, Nov 3, 2017 at 4:40 PM, Bryan Drewery <bdrewery at freebsd.org> wrote:

> On 11/3/2017 3:32 PM, Warner Losh wrote:
> >
> >
> > On Fri, Nov 3, 2017 at 4:28 PM, Bryan Drewery <bdrewery at freebsd.org
> > <mailto:bdrewery at 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
> >     <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 at .
> >     >
> >     >   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...
> >
>
> Only happens with zsh.
>
> > [root at c1100-1][pts/8][zsh/2][Fri 11/03/2017 15:40:10 PDT][0?2&]
> (git-svn)-[master]-
> > ~/git/freebsd # BUILDENV_SHELL=csh make buildenv
> > Entering world for amd64:amd64
> > root at c1100-1:~/git/freebsd # exit
> > exit
> > ~/git/freebsd # BUILDENV_SHELL=/usr/local/bin/zsh make buildenv
> > Entering world for amd64:amd64
> > For ZSH you must run: export CPUTYPE=
> > (buildenv) [root at c1100-1][pts/8][zsh/3][Fri 11/03/2017 15:40:23
> PDT][1?0&] (git-svn)-[master]-
> > ~/git/freebsd # exit
> > *** Error code 1
> >
> > Stop.
> > make[1]: stopped in /root/git/freebsd
> > *** Error code 1
> >
> > Stop.
> > make: stopped in /root/git/freebsd
>

Shouldn't this be fixed in upstream zsh rather than yet another ZSH wart in
the buildsystem that literally has another ZSH wart in the same line?

Warner