Merge pull request #4010 from Ericson2314/purge-cross-conditional-preview

Purge much `is_cross` and `<things>_cross` without changing user interfaces---includes on #5263

1 files changed, 3 insertions, 2 deletions

diff --git a/mesonbuild/cmake/client.py b/mesonbuild/cmake/client.py
index f4b549b..93985e9 100644
--- a/mesonbuild/cmake/client.py
+++ b/mesonbuild/cmake/client.py
@@ -18,6 +18,7 @@
 from .common import CMakeException
 from ..environment import Environment
 from ..dependencies.base import CMakeDependency, ExternalProgram
+from ..mesonlib import MachineChoice
 from .. import mlog
 from contextlib import contextmanager
 from subprocess import Popen, PIPE, TimeoutExpired
@@ -473,8 +474,8 @@ class CMakeClient:
     def startup(self) -> None:
         if self.proc is not None:
             raise CMakeException('The CMake server was already started')
-
-        cmake_exe, cmake_vers, _ = CMakeDependency.find_cmake_binary(self.env)
+        for_machine = MachineChoice.HOST # TODO make parameter
+        cmake_exe, cmake_vers, _ = CMakeDependency.find_cmake_binary(self.env, for_machine)
         if cmake_exe is None or cmake_exe is False:
             raise CMakeException('Unable to find CMake')
         assert(isinstance(cmake_exe, ExternalProgram))