svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

[Bryan Drewery]

On 3/10/2016 5:35 PM, Simon J. Gerraty wrote:
> Author: sjg
> Date: Fri Mar 11 01:35:39 2016
> New Revision: 296637
> URL: https://svnweb.freebsd.org/changeset/base/296637
> 
> Log:
>   Merge bmake-20160307
> 
> Modified:
...
>   head/share/mk/sys.dependfile.mk

> index d12d939..745873f 100644
> --- a/share/mk/sys.dependfile.mk
> +++ b/share/mk/sys.dependfile.mk
> @@ -1,5 +1,5 @@
>  # $FreeBSD$
> -# $Id: sys.dependfile.mk,v 1.6 2014/08/02 18:02:06 sjg Exp $
> +# $Id: sys.dependfile.mk,v 1.7 2016/02/20 01:57:39 sjg Exp $
>  #
>  #      @(#) Copyright (c) 2012, Simon J. Gerraty
>  #
> @@ -49,8 +49,10 @@ _e := ${.MAKE.DEPENDFILE_PREFERENCE:@m@${exists($m):?$m:}@}
>  # MACHINE specific depend files are supported, but *not* default.
>  # If any already exist, we should follow suit.
>  _aml = ${ALL_MACHINE_LIST:Uarm amd64 i386 powerpc:N${MACHINE}} ${MACHINE}
> -# MACHINE must be the last entry in _aml ;-)
> +# make sure we restore MACHINE
> +_m := ${MACHINE}
>  _e := ${_aml:@MACHINE@${.MAKE.DEPENDFILE_PREFERENCE:@m@${exists($m):?$m:}@}@}
> +MACHINE := ${_m}
>  .if !empty(_e)
>  .MAKE.DEPENDFILE ?= ${.MAKE.DEPENDFILE_PREFERENCE:M*${MACHINE}:[1]}
>  .endif


What changed in bmake to require this? Now in older checkouts I don't
get MACHINE defined with DIRDEPS_BUILD without this change.  That's not
ideal since it breaks older builds.

It seems the old version had @MACHINE in its own scope but now is in global.

> ~/git/freebsd # WITH_DIRDEPS_BUILD=yes make -V MACHINE
> make: "/root/git/freebsd/share/mk/local.meta.sys.mk" line 213: Malformed conditional (${MACHINE} == "host")
> make: "/root/git/freebsd/share/mk/local.meta.sys.mk" line 249: Malformed conditional (${MACHINE} == "host")
> make: "/root/git/freebsd/share/mk/local.meta.sys.mk" line 255: Malformed conditional (${MACHINE:Nhost:Ncommon} != "" && ${MACHINE} != ${HOST_MACHINE})
> make: Fatal errors encountered -- cannot continue
> make: stopped in /root/git/freebsd

older bmake:

> ~/git/freebsd # WITH_DIRDEPS_BUILD=yes make.bak -V MACHINE
> amd64


-- 
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-head/attachments/20160313/a53978b8/attachment.sig>