diff options
| author | Mark Hindley <mark@hindley.org.uk> | 2020-06-21 14:13:52 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-07-30 12:04:54 -0700 |
| commit | cc201a539674babf46f726859587afb5ed6a6867 (patch) | |
| tree | 443209ccb59671c28d6c800e6ae0c033b082c89b | |
| parent | 40c197d524181713968ac5a1f052671744915c62 (diff) | |
| download | meson-cc201a539674babf46f726859587afb5ed6a6867.zip meson-cc201a539674babf46f726859587afb5ed6a6867.tar.gz meson-cc201a539674babf46f726859587afb5ed6a6867.tar.bz2 | |
Support armel/armhf builds on native arm64 hosts.
| -rw-r--r-- | mesonbuild/environment.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 00922c1..a82c8f8 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 |