X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=d4682eaabc6d044742b258bb40795d45b5b2ea12;hb=ffe71d18b231aa0223f8ca9229760e6ebced367e;hp=1f9cdace5889211a22748ab6f5abe83c358c487c;hpb=aeecdc1180a479d891cfa8e386348c3f57c7905d;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 1f9cdac..d4682ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,12 +105,21 @@ alpha*-unknown-freebsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='freebsd'
         ;;
-amd64*-unknown-openbsd*)
-	HostPlatform=amd64-unknown-openbsd
-	TargetPlatform=amd64-unknown-openbsd
-	BuildPlatform=amd64-unknown-openbsd
-        HostPlatform_CPP='amd64_unknown_openbsd'
-        HostArch_CPP='amd64'
+alpha*-unknown-openbsd*)
+	HostPlatform=alpha-unknown-openbsd
+	TargetPlatform=alpha-unknown-openbsd
+	BuildPlatform=alpha-unknown-openbsd
+        HostPlatform_CPP='alpha_unknown_openbsd'
+        HostArch_CPP='alpha'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
+amd64*-*-openbsd*)
+	HostPlatform=x86_64-unknown-openbsd
+	TargetPlatform=x86_64-unknown-openbsd
+	BuildPlatform=x86_64-unknown-openbsd
+        HostPlatform_CPP='x86_64_unknown_openbsd'
+        HostArch_CPP='x86_64'
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
         ;;
@@ -123,6 +132,15 @@ arm*-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
+arm*-openbsd*)
+        HostPlatform=arm-unknown-openbsd
+        TargetPlatform=arm-unknown-openbsd
+        BuildPlatform=arm-unknown-openbsd
+        HostPlatform_CPP='arm_unknown_openbsd'                 
+        HostArch_CPP='arm'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 hppa*-*-linux*)
         HostPlatform=hppa-unknown-linux # hack again
         TargetPlatform=hppa-unknown-linux
@@ -132,6 +150,15 @@ hppa*-*-linux*)
         HostVendor_CPP='unknown'                             
         HostOS_CPP='linux'
         ;;
+hppa*-*-openbsd*)
+        HostPlatform=hppa-unknown-openbsd # hack again
+        TargetPlatform=hppa-unknown-openbsd
+        BuildPlatform=hppa-unknown-openbsd
+        HostPlatform_CPP='hppa_unknown_openbsd'                
+        HostArch_CPP='hppa'
+        HostVendor_CPP='unknown'                             
+        HostOS_CPP='openbsd'
+        ;;
 hppa1.1-hp-hpux*)
 	HostPlatform=hppa1.1-hp-hpux  # canonicalise for our purposes (hack)
 	TargetPlatform=hppa1.1-hp-hpux
@@ -299,6 +326,15 @@ m68k-sun-sunos4*)
         HostVendor_CPP='sun'
         HostOS_CPP='sunos4'
         ;;
+m88k-*-openbsd*)
+	HostPlatform=m88k-unknown-openbsd
+	TargetPlatform=m88k-unknown-openbsd
+	BuildPlatform=m88k-unknown-openbsd
+        HostPlatform_CPP='m88k_unknown_openbsd'
+        HostArch_CPP='m88k'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 mips-*-linux*)
         HostPlatform=mips-unknown-linux # hack again
         TargetPlatform=mips-unknown-linux
@@ -359,6 +395,15 @@ powerpc-unknown-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
+powerpc-unknown-openbsd*)
+        HostPlatform=powerpc-unknown-openbsd
+        TargetPlatform=powerpc-unknown-openbsd
+        BuildPlatform=powerpc-unknown-openbsd
+        HostPlatform_CPP='powerpc_unknown_openbsd'
+        HostArch_CPP='powerpc'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 s390-ibm-linux*)
        HostPlatform=s390-ibm-linux
        TargetPlatform=s390-ibm-linux #hack
@@ -404,6 +449,24 @@ sparc-*-openbsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
         ;;
+sparc64-*-openbsd*)
+        HostPlatform=sparc64-unknown-openbsd
+        TargetPlatform=sparc64-unknown-openbsd
+        BuildPlatform=sparc64-unknown-openbsd
+        HostPlatform_CPP='sparc64_unknown_openbsd'
+        HostArch_CPP='sparc64'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
+vax-*-openbsd*)
+        HostPlatform=vax-unknown-openbsd
+        TargetPlatform=vax-unknown-openbsd
+        BuildPlatform=vax-unknown-openbsd
+        HostPlatform_CPP='vax_unknown_openbsd'
+        HostArch_CPP='vax'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='openbsd'
+        ;;
 *)
         echo "Unrecognised platform: $HostPlatform"
         exit 1
@@ -457,11 +520,23 @@ dnl Remove common automounter nonsense
 dnl
 hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' `
 
-dnl Find 'hardtop_plat', the native format for 'hardtop' (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped).
+dnl Find 'hardtop_plat', the native format for 'hardtop' 
+dnl (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped).
+dnl
+dnl Note OSTYPE: On Cygwin we need to use 'cygpath' to convert /cygdrive/c/foo to c:/foo
+dnl		 but we must not do that if we aren't building using Cygwin (notably msys), 
+dnl		 because cygpath doesn't exist.  It seems that 'bash' sets OSTYPE to 'cygwin' 
+dnl		 or 'msys' respectively, but cygwin's 'sh' does not.  So we hackily assume
+dnl		 that if the shell hasn't set it to 'msys' then we must be in Cygwin.  Sigh.
+dnl
+dnl		 The Right Thing is probably to test $BuildPlatform instead, but we are sloppy 
+dnl		 about setting that correctly at the moment, so we just work around for now.
 dnl
+dnl		 The quotes round "$(OSTYPE)" are essential, for the Cygwin-sh case where OSTYPE
+dnl		 is not set.
 case $HostPlatform in
   i386-unknown-mingw32 | i386-unknown-cygwin32)
-        if test ${OSTYPE} != "msys" 
+        if test "${OSTYPE}" != "msys" 
           then
             # convert $hardtop to a path that mingw will understand too
             cyghardtop=${hardtop}
@@ -531,7 +606,7 @@ AC_ARG_WITH(gcc,
 [WhatGccIsCalled="$withval"
  if test "x$HostPlatform" = "xi386-unknown-mingw32"
     then
-       if test ${OSTYPE} != "msys"
+       if test "${OSTYPE}" != "msys"
          then
          # Canonicalise to <drive>:/path/to/gcc
          withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' `
@@ -793,7 +868,7 @@ case $Catalog in
    glafp*) 
 	case $HostOS_CPP in
 	   mingw32)
-	          if test ${OSTYPE} == "msys"
+	          if test "${OSTYPE}" == "msys"
 	            then
 	              Catalog=$hardtop/$Catalog
 	            else
@@ -1418,7 +1493,7 @@ dnl ** check for ld, and whether ld has -x option
 AC_PATH_PROG(LdCmdRaw, ld)
 case $HostOS_CPP in
  mingw32) 
-        if test ${OSTYPE} == "msys"
+        if test "${OSTYPE}" == "msys"
 	   then
              LdCmd=${LdCmdRaw}
 	   else