[Mesa-dev] [PATCH] scons: Fix force_scons parsing.
Jose Fonseca
jfonseca at vmware.com
Fri Oct 25 21:12:28 UTC 2019
- 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:
--
2.17.1
More information about the mesa-dev
mailing list