guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: build: Reject ARMv6 systems.


From: Ludovic Courtès
Subject: 02/02: build: Reject ARMv6 systems.
Date: Wed, 25 Nov 2015 16:01:19 +0000

civodul pushed a commit to branch master
in repository guix.

commit 968ae903189c6c4a41c0e2cddf41ffc5a8c32f93
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 25 16:58:59 2015 +0100

    build: Reject ARMv6 systems.
    
    Fixes <http://bugs.gnu.org/21987>.
    Reported by Martin Vahi <address@hidden>.
    
    * m4/guix.m4 (GUIX_SYSTEM_TYPE): Restrict ARM systems to arm|armv[7-9].
---
 m4/guix.m4 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/m4/guix.m4 b/m4/guix.m4
index 842249a..8e1cfa0 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,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]