From 1909a8180b60cf9b8cc3663dff9fb486b13ab3b4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 2 Oct 2024 18:54:02 +0100 Subject: env2mfile: Map Debian GNU/Hurd to system() -> gnu As per , and matching what happens when running Meson for a native build on Debian GNU/Hurd. Signed-off-by: Simon McVittie --- mesonbuild/scripts/env2mfile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mesonbuild/scripts') diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py index 68496b9f2..57a679c59 100755 --- a/mesonbuild/scripts/env2mfile.py +++ b/mesonbuild/scripts/env2mfile.py @@ -142,6 +142,11 @@ deb_cpu_map = { 'powerpc64le': 'ppc64', } +# map from DEB_HOST_ARCH_OS to Meson machine.system() +deb_os_map = { + 'hurd': 'gnu', +} + def replace_special_cases(special_cases: T.Mapping[str, str], name: str) -> str: ''' If name is a key in special_cases, replace it with the value, or otherwise @@ -188,7 +193,7 @@ def dpkg_architecture_to_machine_info(output: str, options: T.Any) -> MachineInf k, v = line.split('=', 1) data[k] = v host_arch = data['DEB_HOST_GNU_TYPE'] - host_os = data['DEB_HOST_ARCH_OS'] + host_os = replace_special_cases(deb_os_map, data['DEB_HOST_ARCH_OS']) host_subsystem = host_os host_kernel = 'linux' host_cpu_family = replace_special_cases(deb_cpu_family_map, data['DEB_HOST_GNU_CPU']) -- cgit v1.2.3