X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=74a72c842e71ee5e189e4fcb4b99295d141cf12b;hb=3719b69dfc496cdacfe857e1a42984c435eb8a6c;hp=61a915f7debbc075e02fc2c14aefd1b430f87e94;hpb=61ed9891c7c5c231c755f96afda7a0341fcf02e4;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 61a915f7deb..74a72c842e7 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:
@@ -95,7 +94,7 @@ with open("VERSION") as f:
   mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
     ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
-    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/issues\\"'),
+    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\\"'),
 ])
 
 # Includes