[commit: ghc] master: configure: Accept version suffix in solaris name (60aa53d)

git at git.haskell.org git at git.haskell.org
Mon Mar 19 20:47:35 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/60aa53d97da1bbfbb88e9f2791c3f686ba34e764/ghc

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

commit 60aa53d97da1bbfbb88e9f2791c3f686ba34e764
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Mar 19 13:32:14 2018 -0400

    configure: Accept version suffix in solaris name
    
    Summary: OpenIndiana apparently reports a triple of i386-pc-solaris2.11.
    
    Reviewers: hvr
    
    Subscribers: rwbarton, thomie, erikd, carter
    
    Differential Revision: https://phabricator.haskell.org/D4487


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

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

diff --git a/aclocal.m4 b/aclocal.m4
index 58d43e1..e19cbf2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1970,7 +1970,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|nextstep2|nextstep3|sunos4|ultrix|haiku)
+      freebsd|netbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
         $3="$1"
         ;;
       aix*) # e.g. powerpc-ibm-aix7.1.3.0
@@ -1979,6 +1979,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