[commit: base] master: base: use --host as target, not uname (9c7f742)

Simon Marlow marlowsd at gmail.com
Thu Feb 14 13:34:40 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9c7f74285d7085ec901875a17dd819bba10d21f7

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

commit 9c7f74285d7085ec901875a17dd819bba10d21f7
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Wed Feb 13 23:25:24 2013 +0300

    base: use --host as target, not uname
    
    Fixed bootstrap failure on linux for --target=mingw32
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>

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

 configure.ac |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b679520..7553a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,17 +5,23 @@ AC_CONFIG_SRCDIR([include/HsBase.h])
 
 AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h])
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
 AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
 AC_PROG_CC()
 
-case `uname -s` in
-    MINGW*|CYGWIN*)
+AC_MSG_CHECKING(for WINDOWS platform)
+case $host in
+    *mingw32*|*cygwin*)
         WINDOWS=YES;;
     *)
         WINDOWS=NO;;
 esac
+AC_MSG_RESULT($WINDOWS)
 
 # do we have long longs?
 AC_CHECK_TYPES([long long])





More information about the ghc-commits mailing list