diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/environment.py | 4 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index ce037dd..03cd16e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1654,10 +1654,10 @@ class Environment: def get_scratch_dir(self) -> str: return self.scratch_dir - def detect_objc_compiler(self, for_machine: MachineInfo) -> 'Compiler': + def detect_objc_compiler(self, for_machine: MachineChoice) -> 'Compiler': return self._detect_objc_or_objcpp_compiler(for_machine, True) - def detect_objcpp_compiler(self, for_machine: MachineInfo) -> 'Compiler': + def detect_objcpp_compiler(self, for_machine: MachineChoice) -> 'Compiler': return self._detect_objc_or_objcpp_compiler(for_machine, False) def _detect_objc_or_objcpp_compiler(self, for_machine: MachineChoice, objc: bool) -> 'Compiler': diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 809ccdf..4dd47e4 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -40,7 +40,7 @@ SET # If on Windows and VS is installed but not set up in the environment, # set it to be runnable. In this way Meson can be directly invoked # from any shell, VS Code etc. -def setup_vsenv(): +def setup_vsenv() -> None: import subprocess, json, pathlib if not mesonlib.is_windows(): return |