diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-02 19:30:55 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-25 19:34:48 +0200 |
| commit | 3f889606c7debafacd3da9c9e74caa61b45a13ff (patch) | |
| tree | 2bc4821baebd6e50bfd2999d034328d60c596ff2 /mesonbuild/compilers/mixins | |
| parent | 0f237b8d1d84e4906c758bbef44d81e93207f8e4 (diff) | |
| download | meson-3f889606c7debafacd3da9c9e74caa61b45a13ff.zip meson-3f889606c7debafacd3da9c9e74caa61b45a13ff.tar.gz meson-3f889606c7debafacd3da9c9e74caa61b45a13ff.tar.bz2 | |
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.
Diffstat (limited to 'mesonbuild/compilers/mixins')
| -rw-r--r-- | mesonbuild/compilers/mixins/intel.py | 5 |
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) |