From cc201a539674babf46f726859587afb5ed6a6867 Mon Sep 17 00:00:00 2001 From: Mark Hindley Date: Sun, 21 Jun 2020 14:13:52 +0100 Subject: Support armel/armhf builds on native arm64 hosts. --- mesonbuild/environment.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 00922c11c..a82c8f873 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -451,7 +451,8 @@ def machine_info_can_run(machine_info: MachineInfo): true_build_cpu_family = detect_cpu_family({}) return \ (machine_info.cpu_family == true_build_cpu_family) or \ - ((true_build_cpu_family == 'x86_64') and (machine_info.cpu_family == 'x86')) + ((true_build_cpu_family == 'x86_64') and (machine_info.cpu_family == 'x86')) or \ + ((true_build_cpu_family == 'aarch64') and (machine_info.cpu_family == 'arm')) def search_version(text: str) -> str: # Usually of the type 4.1.4 but compiler output may contain -- cgit v1.3