summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-03-17 12:12:43 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2018-03-17 12:22:09 +0000
commit1522cf05c9c3e9afd3ef9c7f3f419460c41488d9 (patch)
tree0262d68c16c4fe813309a5344ae3191b2f2f099f
parentcb6d8589c83247ec96d5faa82df3e93f419bbfe0 (diff)
downloadhaskell-1522cf05c9c3e9afd3ef9c7f3f419460c41488d9.tar.gz
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@gentoo.org>
-rw-r--r--aclocal.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 528fd0c306..04a6bf564d 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