[Mesa-dev] [PATCH] scons: Fix force_scons parsing.

[Dylan Baker]

If you haven't pushed this yet, could you add:
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2003

To the commit message?

Dylan

Quoting Roland Scheidegger (2019-10-25 15:40:02)
> Looks alright to me.
> Reviewed-by: Roland Scheidegger <sroland at vmware.com>
> 
> Am 25.10.19 um 23:12 schrieb Jose Fonseca:
> > - Use parsed options instead of using ARGUMENTS directly.
> > - Handle case mingw cross compilation.
> > ---
> >  SConstruct | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/SConstruct b/SConstruct
> > index 61a915f7deb..f905189dd9e 100644
> > --- a/SConstruct
> > +++ b/SConstruct
> > @@ -71,9 +71,8 @@ Help(opts.GenerateHelpText(env))
> >  #######################################################################
> >  # Print a deprecation warning for using scons on non-windows
> >  
> > -if common.host_platform != 'windows':
> > -    force = ARGUMENTS['force_scons']
> > -    if force.lower() not in {'false', 'off', 'none', '0', 'n'}:
> > +if common.host_platform != 'windows' and env['platform'] != 'windows':
> > +    if env['force_scons']:
> >          print("WARNING: Scons is deprecated for non-windows platforms (including cygwin) "
> >                "please use meson instead.", file=sys.stderr)
> >      else:
> > 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20191025/ad76b0fc/attachment.sig>