summary refs log tree commit diff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/guix.m49
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,