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>
This commit is contained in:
@@ -31,6 +31,7 @@ import common
|
|||||||
# Minimal scons version
|
# Minimal scons version
|
||||||
|
|
||||||
EnsureSConsVersion(2, 4)
|
EnsureSConsVersion(2, 4)
|
||||||
|
EnsurePythonVersion(2, 7)
|
||||||
|
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
@@ -221,10 +221,6 @@ def generate(env):
|
|||||||
env['suncc'] = env['platform'] == 'sunos' and os.path.basename(env['CC']) == 'cc'
|
env['suncc'] = env['platform'] == 'sunos' and os.path.basename(env['CC']) == 'cc'
|
||||||
env['icc'] = 'icc' == os.path.basename(env['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
|
# shortcuts
|
||||||
machine = env['machine']
|
machine = env['machine']
|
||||||
platform = env['platform']
|
platform = env['platform']
|
||||||
|
Reference in New Issue
Block a user