diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2019-10-25 22:09:34 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2019-10-26 08:23:48 +0100 |
| commit | ace5138548c9833dacad14482ecadaa672884611 (patch) | |
| tree | 86ba4de00a7c102c12da5308f78414837af7d5cf /SConstruct | |
| parent | cff53da3748df296d104fe91fca13111296ce527 (diff) | |
| download | mesa-ace5138548c9833dacad14482ecadaa672884611.tar.gz | |
scons: Fix force_scons parsing.
- Use parsed options instead of using ARGUMENTS directly.
- Handle the case of mingw cross compilation.
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2003
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 5 |
1 files 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: |