diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-07-14 17:39:30 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-15 22:12:53 -0400 |
| commit | 2fd7d64a50aa4f8a76d5b9ca13f7d8f8f40b959c (patch) | |
| tree | 5446834e0c4686d0c16d7ae3609b19f1ff486540 /mesonbuild | |
| parent | 066cf804bb3981db64043dc5f3f03a9d493d27d6 (diff) | |
| download | meson-2fd7d64a50aa4f8a76d5b9ca13f7d8f8f40b959c.zip meson-2fd7d64a50aa4f8a76d5b9ca13f7d8f8f40b959c.tar.gz meson-2fd7d64a50aa4f8a76d5b9ca13f7d8f8f40b959c.tar.bz2 | |
Revert "Support armel/armhf builds on native arm64 hosts."
This reverts commit cc201a539674babf46f726859587afb5ed6a6867.
It's true that some aarch64 CPUs can run 32-bit ARM code, but some
(especially high-end ones, those most likely to be running builds)
cannot. It's better to assume that they can't, so builds don't
unnecessarily fail due to attempting to run a sanity check executable.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/environment.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 1dcd229..640c1b8 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -513,8 +513,7 @@ def machine_info_can_run(machine_info: MachineInfo): return \ (machine_info.cpu_family == true_build_cpu_family) or \ ((true_build_cpu_family == 'x86_64') and (machine_info.cpu_family == 'x86')) or \ - ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips')) or \ - ((true_build_cpu_family == 'aarch64') and (machine_info.cpu_family == 'arm')) + ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips')) class Environment: private_dir = 'meson-private' |