diff options
| author | Xavier Claessens <xclaessens@netflix.com> | 2025-10-12 10:20:47 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2025-10-15 12:15:39 -0400 |
| commit | bd33265b04ca609afe6bb895453c5757bbbbb27d (patch) | |
| tree | 03b87a92694d2f7821612f6405540cc0e044ab6d /mesonbuild/modules/__init__.py | |
| parent | 4795475595ef6b87074df9e38d09a3dff2690396 (diff) | |
| download | meson-bd33265b04ca609afe6bb895453c5757bbbbb27d.tar.gz | |
Replace OverrideExecutable and OverrideProgram with LocalProgram
Diffstat (limited to 'mesonbuild/modules/__init__.py')
| -rw-r--r-- | mesonbuild/modules/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index f306f3ca5..5f088e9ed 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -18,7 +18,6 @@ if T.TYPE_CHECKING: from ..interpreter import Interpreter from ..interpreter.interpreter import ProgramVersionFunc from ..interpreterbase import TYPE_var, TYPE_kwargs - from ..programs import OverrideProgram from ..dependencies import Dependency from ..options import ElementaryOptionValues @@ -75,14 +74,14 @@ class ModuleState: required: bool = True, version_func: T.Optional[ProgramVersionFunc] = None, wanted: T.Union[str, T.List[str]] = '', silent: bool = False, - for_machine: MachineChoice = MachineChoice.HOST) -> T.Union[ExternalProgram, build.OverrideExecutable, OverrideProgram, build.LocalProgram]: + for_machine: MachineChoice = MachineChoice.HOST) -> T.Union[ExternalProgram, build.LocalProgram]: if not isinstance(prog, list): prog = [prog] return self._interpreter.find_program_impl(prog, required=required, version_func=version_func, wanted=wanted, silent=silent, for_machine=for_machine) def find_tool(self, name: str, depname: str, varname: str, required: bool = True, - wanted: T.Optional[str] = None) -> T.Union[build.OverrideExecutable, ExternalProgram, OverrideProgram, build.LocalProgram]: + wanted: T.Optional[str] = None) -> T.Union[ExternalProgram, build.LocalProgram]: # Look in overrides in case it's built as subproject progobj = self._interpreter.program_from_overrides([name], []) if progobj is not None: |
