diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-11-25 16:58:59 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-11-25 17:01:02 +0100 |
| commit | 968ae903189c6c4a41c0e2cddf41ffc5a8c32f93 (patch) | |
| tree | a09ff99671dcd26d151f223c10a3a3185af401ee /m4/guix.m4 | |
| parent | 13ef3e997b469ab605d29fc91131c0330cb5ec21 (diff) | |
| download | guix-968ae903189c6c4a41c0e2cddf41ffc5a8c32f93.tar guix-968ae903189c6c4a41c0e2cddf41ffc5a8c32f93.tar.gz | |
build: Reject ARMv6 systems.
Fixes <http://bugs.gnu.org/21987>.
Reported by Martin Vahi <martin.vahi@softf1.com>.
* m4/guix.m4 (GUIX_SYSTEM_TYPE): Restrict ARM systems to arm|armv[7-9].
Diffstat (limited to 'm4/guix.m4')
| -rw-r--r-- | m4/guix.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 842249a848..8e1cfa037c 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -50,8 +50,13 @@ AC_DEFUN([GUIX_SYSTEM_TYPE], [ i*86) machine_name="i686";; amd64) - machine_name="x86_64";; - arm*) + machine_name="x86_64";; + arm|armv[7-9]*) + # Here we want to exclude CPUs such as "armv6l". On ARMv7 + # machines, we normally get "armv7l". However, in Guix, we + # configure with --build=arm-unknown-linux-gnueabihf, leading + # to just "arm", so we also have to allow it. + # # TODO: If not cross-compiling, add a sanity check to make # sure this build machine has the needed features to # support executables compiled using our armhf gcc, |