Skip to content

Commit

Permalink
compilers: Detect Vala compiler for the requested machine
Browse files Browse the repository at this point in the history
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 af846a1.
  • Loading branch information
oleavr committed Feb 12, 2024
1 parent adf09b8 commit 3e2c3f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mesonbuild/compilers/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 3e2c3f8

Please sign in to comment.