diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-05-19 21:21:25 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-05-19 21:21:25 +0400 |
| commit | 85398dea500efd09f18cbbc7d96288737ec5228e (patch) | |
| tree | 2312061d87d342dc32317bac4f67fdfe7a2aa163 /build_files/scons | |
| parent | 4fc0992f117455cd2a7f9b1c4374a03b8f68a991 (diff) | |
make MSVC plaformsuffix check much stricter. For some reason MSVC_VERSION is set
Diffstat (limited to 'build_files/scons')
| -rw-r--r-- | build_files/scons/tools/btools.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 64c56f03a32..c021cc859dc 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -664,6 +664,9 @@ def buildslave(target=None, source=None, env=None): else: platform = env['OURPLATFORM'].split('-')[0] + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '9.0': + platform = platform + '9' + if platform == 'linux': import platform @@ -680,8 +683,6 @@ def buildslave(target=None, source=None, env=None): if platform == 'darwin': platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE'] - if env['MSVC_VERSION'] == '9.0': - platform = env['OURPLATFORM'] + '9' branch = env['BUILDBOT_BRANCH'] |