Mesa (master): scons: Fix force_scons parsing.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ace5138548c9833dacad14482ecadaa672884611
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ace5138548c9833dacad14482ecadaa672884611

Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Fri Oct 25 22:09:34 2019 +0100

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 at vmware.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2003

---

 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: