[commit: ghc] master: aclocal.m4: allow more GNU/Hurd tuples (1522cf0)

git at git.haskell.org git at git.haskell.org
Sat Mar 17 12:22:47 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1522cf05c9c3e9afd3ef9c7f3f419460c41488d9/ghc

>---------------------------------------------------------------

commit 1522cf05c9c3e9afd3ef9c7f3f419460c41488d9
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Sat Mar 17 12:12:43 2018 +0000

    aclocal.m4: allow more GNU/Hurd tuples
    
    Running plain ./configure fails on hurd because
    ./config.guess reports unrecognised tuple:
        $ ./config.guess
        i686-unknown-gnu0.9
    
    The change makes the following target configure:
    $ ./configure --target=i686-unknown-gnu0.9
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>


>---------------------------------------------------------------

1522cf05c9c3e9afd3ef9c7f3f419460c41488d9
 aclocal.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 528fd0c..04a6bf5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1950,6 +1950,9 @@ AC_DEFUN([GHC_CONVERT_VENDOR],[
 # converts os from gnu to ghc naming, and assigns the result to $target_var
 AC_DEFUN([GHC_CONVERT_OS],[
     case "$1" in
+      gnu*) # e.g. i686-unknown-gnu0.9
+        $3="gnu"
+        ;;
       # watchos and tvos are ios variants as of May 2017.
       ios|watchos|tvos)
         $3="ios"
@@ -1964,7 +1967,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
         $3="openbsd"
         ;;
       # As far as I'm aware, none of these have relevant variants
-      freebsd|netbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|haiku)
+      freebsd|netbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
         $3="$1"
         ;;
       aix*) # e.g. powerpc-ibm-aix7.1.3.0



More information about the ghc-commits mailing list