Skip to content

Commit 26b279c

Browse files
committed
env2mfile: Use a cross valac on Debian if possible
This is functionally equivalent to the logic used to locate pkg-config, but puts it below the "Compilers" heading rather than "Other binaries". Signed-off-by: Simon McVittie <[email protected]>
1 parent 5876efc commit 26b279c

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

mesonbuild/scripts/env2mfile.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,13 @@ def dpkg_architecture_to_machine_info(output: str, options: T.Any) -> MachineInf
289289
infos.binaries[tool] = locate_path("%s-%s" % (host_arch, exe))
290290
except ValueError:
291291
pass
292+
for tool, exe in [
293+
('vala', 'valac'),
294+
]:
295+
try:
296+
infos.compilers[tool] = locate_path("%s-%s" % (host_arch, exe))
297+
except ValueError:
298+
pass
292299
try:
293300
infos.binaries['cups-config'] = locate_path("cups-config")
294301
except ValueError:

unittests/internaltests.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,6 +1763,7 @@ def locate_path(program: str) -> T.List[str]:
17631763
'cpp': ['/usr/bin/s390x-linux-gnu-g++'],
17641764
'objc': ['/usr/bin/s390x-linux-gnu-gobjc'],
17651765
'objcpp': ['/usr/bin/s390x-linux-gnu-gobjc++'],
1766+
'vala': ['/usr/bin/s390x-linux-gnu-valac'],
17661767
},
17671768
binaries={
17681769
'ar': ['/usr/bin/s390x-linux-gnu-ar'],
@@ -1828,6 +1829,7 @@ def locate_path(program: str) -> T.List[str]:
18281829
'cpp': ['/usr/bin/x86_64-linux-gnu-g++'],
18291830
'objc': ['/usr/bin/x86_64-linux-gnu-gobjc'],
18301831
'objcpp': ['/usr/bin/x86_64-linux-gnu-gobjc++'],
1832+
'vala': ['/usr/bin/x86_64-linux-gnu-valac'],
18311833
},
18321834
binaries={
18331835
'ar': ['/usr/bin/x86_64-linux-gnu-ar'],
@@ -1898,6 +1900,7 @@ def locate_path(program: str) -> T.List[str]:
18981900
'cpp': ['/usr/bin/arm-linux-gnueabihf-g++-12'],
18991901
'objc': ['/usr/bin/arm-linux-gnueabihf-gobjc-12'],
19001902
'objcpp': ['/usr/bin/arm-linux-gnueabihf-gobjc++-12'],
1903+
'vala': ['/usr/bin/arm-linux-gnueabihf-valac'],
19011904
},
19021905
binaries={
19031906
'ar': ['/usr/bin/arm-linux-gnueabihf-ar'],
@@ -1971,6 +1974,7 @@ def locate_path(program: str) -> T.List[str]:
19711974
'cpp': ['/usr/bin/i686-gnu-g++'],
19721975
'objc': ['/usr/bin/i686-gnu-gobjc'],
19731976
'objcpp': ['/usr/bin/i686-gnu-gobjc++'],
1977+
'vala': ['/usr/bin/i686-gnu-valac'],
19741978
},
19751979
binaries={
19761980
'ar': ['/usr/bin/i686-gnu-ar'],
@@ -2037,6 +2041,7 @@ def locate_path(program: str) -> T.List[str]:
20372041
'cpp': ['/usr/bin/x86_64-kfreebsd-gnu-g++'],
20382042
'objc': ['/usr/bin/x86_64-kfreebsd-gnu-gobjc'],
20392043
'objcpp': ['/usr/bin/x86_64-kfreebsd-gnu-gobjc++'],
2044+
'vala': ['/usr/bin/x86_64-kfreebsd-gnu-valac'],
20402045
},
20412046
binaries={
20422047
'ar': ['/usr/bin/x86_64-kfreebsd-gnu-ar'],
@@ -2099,6 +2104,7 @@ def locate_path(program: str) -> T.List[str]:
20992104
'cpp': ['/usr/bin/mips64el-linux-gnuabi64-g++'],
21002105
'objc': ['/usr/bin/mips64el-linux-gnuabi64-gobjc'],
21012106
'objcpp': ['/usr/bin/mips64el-linux-gnuabi64-gobjc++'],
2107+
'vala': ['/usr/bin/mips64el-linux-gnuabi64-valac'],
21022108
},
21032109
binaries={
21042110
'ar': ['/usr/bin/mips64el-linux-gnuabi64-ar'],
@@ -2161,6 +2167,7 @@ def locate_path(program: str) -> T.List[str]:
21612167
'cpp': ['/usr/bin/powerpc64le-linux-gnu-g++'],
21622168
'objc': ['/usr/bin/powerpc64le-linux-gnu-gobjc'],
21632169
'objcpp': ['/usr/bin/powerpc64le-linux-gnu-gobjc++'],
2170+
'vala': ['/usr/bin/powerpc64le-linux-gnu-valac'],
21642171
},
21652172
binaries={
21662173
'ar': ['/usr/bin/powerpc64le-linux-gnu-ar'],

0 commit comments

Comments
 (0)