diff options
| author | Florian "sp1rit" <sp1rit@disroot.org> | 2025-05-01 19:07:27 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-05-22 12:23:55 +0300 |
| commit | 7f1437a928d4282e45991ff6145dee8a9043be2f (patch) | |
| tree | 2d2a7252feddc0b7b9a60368ad77f6f8c9d609bb /mesonbuild/modules/__init__.py | |
| parent | e8c715786d85dcdbc367f3e379acae25a899c235 (diff) | |
| download | meson-7f1437a928d4282e45991ff6145dee8a9043be2f.tar.gz | |
support .version() for overridden executables
Also ensure that .get_version() can be called on the output of
_find_tool by the modules (kind of required for #14422).
Diffstat (limited to 'mesonbuild/modules/__init__.py')
| -rw-r--r-- | mesonbuild/modules/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index 67d16661a..87892e6d7 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -75,14 +75,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.Executable, OverrideProgram]: + for_machine: MachineChoice = MachineChoice.HOST) -> T.Union[ExternalProgram, build.OverrideExecutable, OverrideProgram]: 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.Executable', ExternalProgram, 'OverrideProgram']: + wanted: T.Optional[str] = None) -> T.Union[build.OverrideExecutable, ExternalProgram, 'OverrideProgram']: # Look in overrides in case it's built as subproject progobj = self._interpreter.program_from_overrides([name], []) if progobj is not None: |
