Skip to content

Commit cb15ef1

Browse files
committed
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 valac transpiler needs search paths for the host machine (specifically, the `--vapidir` default paths). This reverts part of af846a1.
1 parent f8ebfdf commit cb15ef1

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

mesonbuild/compilers/detect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ def detect_cython_compiler(env: 'Environment', for_machine: MachineChoice) -> Co
968968
raise EnvironmentException('Unreachable code (exception to make mypy happy)')
969969

970970
def detect_vala_compiler(env: 'Environment', for_machine: MachineChoice) -> Compiler:
971-
exelist = env.lookup_binary_entry(MachineChoice.BUILD, 'vala')
971+
exelist = env.lookup_binary_entry(for_machine, 'vala')
972972
is_cross = env.is_cross_build(for_machine)
973973
info = env.machines[for_machine]
974974
if exelist is None:

0 commit comments

Comments
 (0)