summaryrefslogtreecommitdiff
path: root/scripts/Component.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-08-15 15:18:06 +0200
committerJose <jose@zeroc.com>2019-08-15 15:18:06 +0200
commit58f9abd6e8c029a58c526772e92f4d39ca733acf (patch)
tree3930d160419d9407b4aefcb675aa0806b56788d6 /scripts/Component.py
parentFix IceSSL/configuration failures with macOS catalina (diff)
downloadice-58f9abd6e8c029a58c526772e92f4d39ca733acf.tar.bz2
ice-58f9abd6e8c029a58c526772e92f4d39ca733acf.tar.xz
ice-58f9abd6e8c029a58c526772e92f4d39ca733acf.zip
Fix Swift Version check
The check was not working with Swift 5.1 in Catalina, --version returns 5.1 not 5.1.0
Diffstat (limited to 'scripts/Component.py')
-rw-r--r--scripts/Component.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Component.py b/scripts/Component.py
index c5d867fecc6..96eaf36fd9e 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -247,7 +247,7 @@ for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(t
Mapping.add(m, ObjCMapping(), component, enable=isinstance(platform, Darwin))
elif m == "swift" or re.match("swift-.*", m):
# Swift mapping requires Swift 5.0 or greater
- Mapping.add("swift", SwiftMapping(), component, enable=platform.hasSwift((5, 0, 0)))
+ Mapping.add("swift", SwiftMapping(), component, enable=platform.hasSwift((5, 0)))
elif m == "csharp" or re.match("charp-.*", m):
Mapping.add("csharp", CSharpMapping(), component, enable=isinstance(platform, Windows) or platform.hasDotNet())