From 85398dea500efd09f18cbbc7d96288737ec5228e Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Mon, 19 May 2014 19:21:25 +0200 Subject: make MSVC plaformsuffix check much stricter. For some reason MSVC_VERSION is set --- build_files/scons/tools/btools.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'build_files/scons') 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'] -- cgit v1.2.3