[commit: ghc] ghc-8.4: configure: Accept version suffix in solaris name (d7c5ec0)

git at git.haskell.org git at git.haskell.org
Mon Mar 19 12:38:48 UTC 2018


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

On branch  : ghc-8.4
Link       : http://ghc.haskell.org/trac/ghc/changeset/d7c5ec0c28a45ea22c5901a152cbc9123a07564c/ghc

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

commit d7c5ec0c28a45ea22c5901a152cbc9123a07564c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Mar 8 15:26:09 2018 -0500

    configure: Accept version suffix in solaris name
    
    OpenIndiana apparently reports a triple of i386-pc-solaris2.11.


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

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

diff --git a/aclocal.m4 b/aclocal.m4
index c02c1d1..91cdd40 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1976,7 +1976,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
         $3="linux"
         ;;
       # As far as I'm aware, none of these have relevant variants
-      freebsd|netbsd|openbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|haiku)
+      freebsd|netbsd|openbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|haiku)
         $3="$1"
         ;;
       aix*) # e.g. powerpc-ibm-aix7.1.3.0
@@ -1985,6 +1985,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
       darwin*) # e.g. aarch64-apple-darwin14
         $3="darwin"
         ;;
+      solaris2*)
+        $3="solaris2"
+        ;;
       freebsd*) # like i686-gentoo-freebsd7
                 #      i686-gentoo-freebsd8
                 #      i686-gentoo-freebsd8.2



More information about the ghc-commits mailing list