From d983678e16e64d495957a2c47ff1ed3a767009be Mon Sep 17 00:00:00 2001 From: Benoit Foucher 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 --- scripts/TestUtil.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts/TestUtil.py') diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 5eda3d9c885..34b1312b3a6 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1643,8 +1643,7 @@ def getCppBinDir(lang = None): if iceHome: if lang == None: lang = getDefaultMapping() - if lang == "cpp" or lang == "php": - if isVC110(): + if isVC110() and lang != "py": binDir = os.path.join(binDir, "vc110") if x64: if isSolaris(): @@ -1654,8 +1653,7 @@ def getCppBinDir(lang = None): binDir = os.path.join(binDir, "amd64") elif isWin32() and lang != "php": binDir = os.path.join(binDir, "x64") - if isDarwin() and cpp11: - binDir = os.path.join(binDir, "c++11") + return binDir def getSliceTranslator(lang = "cpp"): -- cgit v1.2.3