From 3f889606c7debafacd3da9c9e74caa61b45a13ff Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Wed, 2 Jun 2021 19:30:55 +0200
Subject: Split compiler detection from Environment
This moves all the compiler detection logic into the new
compilers.detect module. This dramatically reduces the size
and complexity of Environment.
---
mesonbuild/compilers/mixins/intel.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'mesonbuild/compilers/mixins')
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)
--
cgit v1.1