diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-03 13:44:19 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-03 13:44:19 +0100 |
| commit | d983678e16e64d495957a2c47ff1ed3a767009be (patch) | |
| tree | 28de64aff7bf6e184dabab9d6dc67117865cbf2a /demoscript | |
| parent | Fixes for ICE-6031 and ICE-6049: better timings for timeout test (diff) | |
| download | ice-d983678e16e64d495957a2c47ff1ed3a767009be.tar.bz2 ice-d983678e16e64d495957a2c47ff1ed3a767009be.tar.xz ice-d983678e16e64d495957a2c47ff1ed3a767009be.zip | |
Fixed ICE-6046: VC110 C# Glacier2/router test failure because no VC120 x64 runtime installed
Diffstat (limited to 'demoscript')
| -rw-r--r-- | demoscript/Util.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 6c635173fb0..135737d38e4 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -279,9 +279,8 @@ def configurePaths(): # Add compiler sub-directory if isWin32(): subdir = None - if getMapping() != "py": - if getCppCompiler() == "VC110": - subdir = "vc110" + if getCppCompiler() == "VC110" and getMapping() != "py": + subdir = "vc110" if subdir: binDir = os.path.join(binDir, subdir) |