svn commit: r325116 - head

[Bryan Drewery]

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 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.

> 
> 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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20171103/f02bc481/attachment.sig>