From f5bd3254e926087091ed4c0e5e561d9118aa114b Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 8 Jun 2020 12:21:42 -0700 Subject: dependencies: Don't allow using the default binary for host on cross compiles Otherwise we can end up finding dependencies from the build machine for the host machine, which is incorrect. This alters cmake, pkg-config, and all config-tool based dependencies. Fixes: #7276 --- mesonbuild/cmake/executor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/cmake/executor.py') diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py index ae4891823..d64286a2e 100644 --- a/mesonbuild/cmake/executor.py +++ b/mesonbuild/cmake/executor.py @@ -93,7 +93,7 @@ class CMakeExecutor: mlog.debug('CMake binary for %s is not cached' % self.for_machine) for potential_cmakebin in find_external_program( environment, self.for_machine, 'cmake', 'CMake', - environment.default_cmake): + environment.default_cmake, allow_default_for_cross=False): version_if_ok = self.check_cmake(potential_cmakebin) if not version_if_ok: continue -- cgit v1.2.3