diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-28 17:30:17 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-28 17:30:17 +0200 |
| commit | 8c87a17030ec21ff968f3ec7c44ba844e5afdaaf (patch) | |
| tree | 0d896cd16f4e50e83615b971522674b1f07c28d1 /scripts/Util.py | |
| parent | Fixed ICE-7841 - IceStorm/stress failure (diff) | |
| download | ice-8c87a17030ec21ff968f3ec7c44ba844e5afdaaf.tar.bz2 ice-8c87a17030ec21ff968f3ec7c44ba844e5afdaaf.tar.xz ice-8c87a17030ec21ff968f3ec7c44ba844e5afdaaf.zip | |
Fixed ICE-7843 - Check NSStreamStatusAtEnd in iOS transports
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 89856d7a51f..f14b7809391 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -294,7 +294,7 @@ class Windows(Platform): cpp = isinstance(mapping, CppMapping) csharp = isinstance(mapping, CSharpMapping) - if ((cpp and v140 and platform == "x64" and buildConfig == "Release") or + if ((cpp and v140 and platform == "x64" and buildConfig == "Release") or (not csharp and not cpp) or (not compiler)): return "bin" @@ -349,8 +349,8 @@ class Windows(Platform): # Use binary distribution from ICE_HOME if building for C++/VC140/x64/Release or # for another mapping than C++ or C#. # - if ((cpp and v140 and platform == "x64" and current.config.buildConfig == "Release") or - (not csharp and not cpp) or + if ((cpp and v140 and platform == "x64" and current.config.buildConfig == "Release") or + (not csharp and not cpp) or (not compiler)): return os.environ.get("ICE_HOME") @@ -893,7 +893,7 @@ class Mapping: sslProps = { "Ice.Plugin.IceSSL" : self.getPluginEntryPoint("IceSSL", process, current), "IceSSL.Password": "password", - "IceSSL.DefaultDir": os.path.join(toplevel, "certs"), + "IceSSL.DefaultDir": "" if current.config.buildPlatform == "iphoneos" else os.path.join(toplevel, "certs"), } # |