From a3e6b81305ea1e7bf78aec6a83b64fd6071a9440 Mon Sep 17 00:00:00 2001 From: Akemi Date: Sat, 24 Nov 2018 12:49:55 +0100 Subject: build: use StrictVersion for swift version comparison --- waftools/checks/custom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'waftools/checks') diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 8cc701f7f7..678232cf2b 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -1,6 +1,7 @@ from waftools import inflector from waftools.checks.generic import * from waflib import Utils +from distutils.version import StrictVersion import os __all__ = ["check_pthreads", "check_iconv", "check_lua", @@ -114,9 +115,8 @@ def check_cocoa(ctx, dependency_identifier): def check_swift(ctx, dependency_identifier): if ctx.env.SWIFT_VERSION: - major = int(ctx.env.SWIFT_VERSION.split('.')[0]) ctx.add_optional_message(dependency_identifier, - 'version found: ' + ctx.env.SWIFT_VERSION) - if major >= 3: + 'version found: ' + str(ctx.env.SWIFT_VERSION)) + if StrictVersion(ctx.env.SWIFT_VERSION) >= StrictVersion("3.0"): return True return False -- cgit v1.2.3