* m4/guix.m4 (GUIX_ASSERT_SUPPORTED_SYSTEM): Don't error if building on an unsupported system. * doc/guix.texi (GNU Distribution): Relabel mips64el-linux as unsupported. --- As we discussed previously with the powerpc-linux patches, I've gotten around to changing the m4 error to a warning. Also, I didn't change i586-gnu to say unsupported next to it in GNU Distribution in the manual, although I suppose the other option would be to add i586-gnu to supported in m4/guix.m4. --- doc/guix.texi | 2 +- m4/guix.m4 | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9bb91b94fd..5cec6c0645 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -525,7 +525,7 @@ way for you to give it a try is by setting up an instance of (@pxref{transparent-emulation-qemu, @code{hurd-vm-service-type}}). @xref{Contributing}, on how to help! -@item mips64el-linux (deprecated) +@item mips64el-linux (unsupported) little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully supported; in particular, there is no ongoing work to ensure that this diff --git a/m4/guix.m4 b/m4/guix.m4 index 05d409a674..7a5eaa47f9 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,7 +1,7 @@ dnl GNU Guix --- Functional package management for GNU dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Courtès dnl Copyright © 2014 Mark H Weaver -dnl Copyright © 2017 Efraim Flashner +dnl Copyright © 2017, 2021 Efraim Flashner dnl Copyright © 2021 Chris Marusich dnl dnl This file is part of GNU Guix. @@ -79,25 +79,14 @@ dnl Assert that this is a system to which the distro is ported. AC_DEFUN([GUIX_ASSERT_SUPPORTED_SYSTEM], [ AC_REQUIRE([GUIX_SYSTEM_TYPE]) - AC_ARG_WITH([courage], [AS_HELP_STRING([--with-courage], - [Assert that even if this platform is unsupported, you will be -courageous and port the GNU System distribution to it (see -"GNU Distribution" in the manual.)])], - [guix_courageous="$withval"], - [guix_courageous="no"]) - # Currently only Linux-based systems are supported, and only on some # platforms. case "$guix_system" in x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux) ;; *) - if test "x$guix_courageous" = "xyes"; then - AC_MSG_WARN([building Guix on `$guix_system', which is not supported]) - else - AC_MSG_ERROR([`$guix_system' is not a supported platform. -See "GNU Distribution" in the manual, or try `--with-courage'.]) - fi + AC_MSG_WARN([`$guix_system' IS NOT A SUPPORTED PLATFORM. +See "GNU Distribution" in the manual, for more information.]) ;; esac ]) base-commit: a7b6c5a1270e52385a70b4192ee40ac6eb3b7c27 -- 2.33.0