diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-03-24 13:30:19 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-03-28 18:24:01 -0400 |
| commit | fcb329a2f4c4db8a23ff54806ced5ef55e841d24 (patch) | |
| tree | 64d997e1a9c60d11ce9d037fc34bc49a0f81bdd4 /SConstruct | |
| parent | 399ba02faf7124d4b4c52f8b7e91f5aeb307ee1b (diff) | |
| download | mongo-fcb329a2f4c4db8a23ff54806ced5ef55e841d24.tar.gz | |
SERVER-28475 Require SCons 2.5 and Python 2.7
Also, a drive by for making the search path for SCons
in buildscripts/scons.py absolute, obviating the need to
explicitly load the "install" tool. This is effectively a partial
revert of the changes made for SERVER-28497.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index ebf62c13d00..1912cd2daf7 100644 --- a/SConstruct +++ b/SConstruct @@ -20,7 +20,8 @@ import SCons # we are to avoid bulk loading all tools in the DefaultEnvironment. DefaultEnvironment(tools=[]) -EnsureSConsVersion( 2, 3, 5 ) +EnsurePythonVersion(2, 7) +EnsureSConsVersion(2, 5) from buildscripts import utils from buildscripts import moduleconfig @@ -587,11 +588,11 @@ def variable_arch_converter(val): def decide_platform_tools(): if is_running_os('windows'): # we only support MS toolchain on windows - return ['msvc', 'mslink', 'mslib', 'masm', 'install'] + return ['msvc', 'mslink', 'mslib', 'masm'] elif is_running_os('linux', 'solaris'): - return ['gcc', 'g++', 'gnulink', 'ar', 'gas', 'install'] + return ['gcc', 'g++', 'gnulink', 'ar', 'gas'] elif is_running_os('darwin'): - return ['gcc', 'g++', 'applelink', 'ar', 'as', 'install'] + return ['gcc', 'g++', 'applelink', 'ar', 'as'] else: return ["default"] |