aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-08-14 10:24:29 -0700
committerDylan Baker <[email protected]>2018-08-16 13:52:56 -0700
commit64e463813079bf73a5373fe39af7bdbd90992a00 (patch)
tree4a71881f0716401e95e0b34038da4a45adc81f61
parent5a8f824d8c3feabd73be6b10c8efebd19120d822 (diff)
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 <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
-rw-r--r--SConstruct1
-rwxr-xr-xscons/gallium.py4
2 files changed, 1 insertions, 4 deletions
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']