From: Dylan Baker <dylan@pnwbakers.com>
Date: Tue, 14 Aug 2018 17:24:29 +0000 (-0700)
Subject: scons: Require python 2.7
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=64e463813079bf73a5373fe39af7bdbd90992a00;p=mesa.git

scons: Require python 2.7

less than 2.7 is not supported.

v2: - Remove check for python >= 2.0, since we've already enforced 2.7

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/SConstruct b/SConstruct
index 6e034fb968f..51dc301a9a8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -31,6 +31,7 @@ import common
 # Minimal scons version
 
 EnsureSConsVersion(2, 4)
+EnsurePythonVersion(2, 7)
 
 
 #######################################################################
diff --git a/scons/gallium.py b/scons/gallium.py
index 92a762a0c1e..659da72c1c3 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -221,10 +221,6 @@ def generate(env):
     env['suncc'] = env['platform'] == 'sunos' and os.path.basename(env['CC']) == 'cc'
     env['icc'] = 'icc' == os.path.basename(env['CC'])
 
-    if env['msvc'] and env['toolchain'] == 'default' and env['machine'] == 'x86_64':
-        # MSVC x64 support is broken in earlier versions of scons
-        env.EnsurePythonVersion(2, 0)
-
     # shortcuts
     machine = env['machine']
     platform = env['platform']