From d983678e16e64d495957a2c47ff1ed3a767009be Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 3 Dec 2014 13:44:19 +0100
Subject: Fixed ICE-6046: VC110 C# Glacier2/router test failure because no
 VC120 x64 runtime installed

---
 demoscript/Util.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'demoscript/Util.py')

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)
-- 
cgit v1.2.3