compilers: Remove Environment parameter from CLikeCompiler.get_compiler_dirs

4 files changed, 8 insertions, 9 deletions

diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index d7cd954d8..198e5b631 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -202,7 +202,7 @@ class _StdCPPLibMixin(CompilerMixinBase):
         # be passed to a different compiler with a different set of default
         # search paths, such as when using Clang for C/C++ and gfortran for
         # fortran.
-        search_dirs = [f'-L{d}' for d in self.get_compiler_dirs(self.environment, 'libraries')]
+        search_dirs = [f'-L{d}' for d in self.get_compiler_dirs('libraries')]
 
         lib = self.language_stdlib_provider(self.environment)
         if self.find_library(lib, []) is not None:
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 1e66d9440..7654b3ffa 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -303,7 +303,7 @@ class GnuFortranCompiler(GnuCompiler, FortranCompiler):
         # search paths, such as when using Clang for C/C++ and gfortran for
         # fortran,
         search_dirs: T.List[str] = []
-        for d in self.get_compiler_dirs(self.environment, 'libraries'):
+        for d in self.get_compiler_dirs('libraries'):
             search_dirs.append(f'-L{d}')
         return search_dirs + ['-lgfortran', '-lm']
 
@@ -573,7 +573,7 @@ class ClassicFlangFortranCompiler(ClangCompiler, FortranCompiler):
         # fortran,
         # XXX: Untested....
         search_dirs: T.List[str] = []
-        for d in self.get_compiler_dirs(self.environment, 'libraries'):
+        for d in self.get_compiler_dirs('libraries'):
             search_dirs.append(f'-L{d}')
         return search_dirs + ['-lflang', '-lpgmath']
 
@@ -621,7 +621,7 @@ class LlvmFlangFortranCompiler(ClangCompiler, FortranCompiler):
     def language_stdlib_only_link_flags(self) -> T.List[str]:
         # matching setup from ClassicFlangFortranCompiler
         search_dirs: T.List[str] = []
-        for d in self.get_compiler_dirs(self.environment, 'libraries'):
+        for d in self.get_compiler_dirs('libraries'):
             search_dirs.append(f'-L{d}')
         # does not automatically link to Fortran_main anymore after
         # https://github.com/llvm/llvm-project/commit/9d6837d595719904720e5ff68ec1f1a2665bdc2f
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 10424ba82..e6637cb1c 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -186,7 +186,7 @@ class CLikeCompiler(Compiler):
             return ['-isystem', path]
         return ['-I' + path]
 
-    def get_compiler_dirs(self, env: 'Environment', name: str) -> T.List[str]:
+    def get_compiler_dirs(self, name: str) -> T.List[str]:
         '''
         Get dirs from the compiler, either `libraries:` or `programs:`
         '''
@@ -195,7 +195,7 @@ class CLikeCompiler(Compiler):
     @functools.lru_cache()
     def _get_library_dirs(self, elf_class: T.Optional[int] = None) -> 'ImmutableListProtocol[str]':
         # TODO: replace elf_class with enum
-        dirs = self.get_compiler_dirs(self.environment, 'libraries')
+        dirs = self.get_compiler_dirs('libraries')
         if elf_class is None or elf_class == 0:
             return dirs
 
@@ -243,7 +243,7 @@ class CLikeCompiler(Compiler):
         Programs used by the compiler. Also where toolchain DLLs such as
         libstdc++-6.dll are found with MinGW.
         '''
-        return self.get_compiler_dirs(self.environment, 'programs')
+        return self.get_compiler_dirs('programs')
 
     def get_program_dirs(self) -> T.List[str]:
         return self._get_program_dirs().copy()
diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py
index c08bce0d5..2a83ae5a5 100644
--- a/mesonbuild/compilers/mixins/gnu.py
+++ b/mesonbuild/compilers/mixins/gnu.py
@@ -23,7 +23,6 @@ if T.TYPE_CHECKING:
     from ..._typing import ImmutableListProtocol
     from ...build import BuildTarget
     from ...options import MutableKeyedOptionDictType
-    from ...environment import Environment
     from ..compilers import Compiler
 else:
     # This is a bit clever, for mypy we pretend that these mixins descend from
@@ -482,7 +481,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
                     result.append(unresolved)
         return result
 
-    def get_compiler_dirs(self, env: 'Environment', name: str) -> T.List[str]:
+    def get_compiler_dirs(self, name: str) -> T.List[str]:
         '''
         Get dirs from the compiler, either `libraries:` or `programs:`
         '''