aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake/executor.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-06-08 12:21:42 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-06-12 11:16:24 -0700
commitf5bd3254e926087091ed4c0e5e561d9118aa114b (patch)
treedde02e0394523a305267cc3b07ea0f5a7a51120b /mesonbuild/cmake/executor.py
parent18d8dbd3bda56a989bb9f6d767c7491fbbd10d45 (diff)
downloadmeson-f5bd3254e926087091ed4c0e5e561d9118aa114b.zip
meson-f5bd3254e926087091ed4c0e5e561d9118aa114b.tar.gz
meson-f5bd3254e926087091ed4c0e5e561d9118aa114b.tar.bz2
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
Diffstat (limited to 'mesonbuild/cmake/executor.py')
-rw-r--r--mesonbuild/cmake/executor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py
index ae48918..d64286a 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