aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/mixins/intel.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/compilers/mixins/intel.py')
-rw-r--r--mesonbuild/compilers/mixins/intel.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/compilers/mixins/intel.py b/mesonbuild/compilers/mixins/intel.py
index 5bca254..89f3518 100644
--- a/mesonbuild/compilers/mixins/intel.py
+++ b/mesonbuild/compilers/mixins/intel.py
@@ -168,14 +168,11 @@ class IntelVisualStudioLikeCompiler(VisualStudioLikeCompiler):
return args
def get_toolset_version(self) -> T.Optional[str]:
- # Avoid circular dependencies....
- from ...environment import search_version
-
# ICL provides a cl.exe that returns the version of MSVC it tries to
# emulate, so we'll get the version from that and pass it to the same
# function the real MSVC uses to calculate the toolset version.
_, _, err = mesonlib.Popen_safe(['cl.exe'])
- v1, v2, *_ = search_version(err).split('.')
+ v1, v2, *_ = mesonlib.search_version(err).split('.')
version = int(v1 + v2)
return self._calculate_toolset_version(version)