X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=691fd457a13c12037056fdfd9014c4c680ab69d4;hb=2fe9913d68e5f9031a41aafb08b3eba0b2f7b6ab;hp=ae9e41ed3424acb17c59ddcf9963937fb790fa76;hpb=650d644055ff9cf23891611efb578e4fff07a1d9;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index ae9e41e..691fd45 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -111,16 +111,6 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         ;;
     esac
 
-    case $$1 in
-    i386-apple-darwin|x86_64-apple-darwin)
-        # We support back to OS X 10.5
-        $2="$$2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
-        $3="$$3 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
-        $4="$$4  -macosx_version_min 10.5"
-        $5="$$5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
-        ;;
-    esac
-
     # If gcc knows about the stack protector, turn it off.
     # Otherwise the stack-smash handler gets triggered.
     echo 'int main(void) {return 0;}' > conftest.c
@@ -1458,7 +1448,7 @@ case "$1" in
   hppa*)
     $2="hppa"
     ;;
-  i386)
+  i386|i486|i586|i686)
     $2="i386"
     ;;
   ia64)
@@ -1511,7 +1501,15 @@ case "$1" in
 # --------------------------------
 # converts vendor from gnu to ghc naming, and assigns the result to $target_var
 AC_DEFUN([GHC_CONVERT_VENDOR],[
-$2="$1"
+  case "$1" in
+  pc|gentoo) # like i686-pc-linux-gnu and i686-gentoo-freebsd8
+    $2="unknown"
+    ;;
+  *)
+    #pass thru by default
+    $2="$1"
+    ;;
+  esac
 ])
 
 # GHC_CONVERT_OS(os, target_var)
@@ -1526,6 +1524,9 @@ case "$1" in
   freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
     $2="$1"
     ;;
+  freebsd8) # like i686-gentoo-freebsd8
+    $2="freebsd"
+    ;;
   *)
     echo "Unknown OS $1"
     exit 1