From 3e2c3f8324267e5c8a555e12d1f3335399382b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Wed, 24 Aug 2022 17:36:21 +0200 Subject: [PATCH] compilers: Detect Vala compiler for the requested machine Instead of unconditionally detecting it for the build machine. The rationale for making this use the build machine was wrong. The Vala compiler needs search paths for the host machine (specifically, the `--vapidir` default paths). This reverts part of af846a109f70b0b063b9d3c7a30225a22949bb48. --- mesonbuild/compilers/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 1f6bb484079d..a744c796f0b3 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -949,7 +949,7 @@ def detect_cython_compiler(env: 'Environment', for_machine: MachineChoice) -> Co def detect_vala_compiler(env: 'Environment', for_machine: MachineChoice) -> Compiler: from .vala import ValaCompiler - exelist = env.lookup_binary_entry(MachineChoice.BUILD, 'vala') + exelist = env.lookup_binary_entry(for_machine, 'vala') is_cross = env.is_cross_build(for_machine) info = env.machines[for_machine] if exelist is None: