X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;fp=aclocal.m4;h=09ef225166c12b3fea06eb871da85dc3a22ff392;hp=84fb2b1a476b7cbd7432c221d80226cedcb7a1a3;hb=001b9a4d8b5e3f120c419c6f6fa3dd67b1d6cd9e;hpb=77b29b5685db2f8745d191af1599ed753bef91e7

diff --git a/aclocal.m4 b/aclocal.m4
index 84fb2b1..09ef225 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8,12 +8,13 @@
 # ----------------------------------
 # Set the C, LD and CPP flags for a given platform
 # $1 is the platform
-# $2 is the name of the C flags variable
-# $3 is the name of the LD flags variable
-# $4 is the name of the CPP flags variable
+# $2 is the name of the CC flags variable
+# $3 is the name of the linker flags variable when linking with gcc
+# $4 is the name of the linker flags variable when linking with ld
+# $5 is the name of the CPP flags variable
 AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
 [
-    AC_MSG_CHECKING([Setting up $2, $3 and $4])
+    AC_MSG_CHECKING([Setting up $2, $3, $4 and $5])
     case $$1 in
     i386-apple-darwin)
         # By default, gcc on OS X will generate SSE
@@ -22,12 +23,14 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         # back to generic i686 compatibility. Trac #2983.
         $2="$$2 -march=i686 -m32"
         $3="$$3 -march=i686 -m32"
-        $4="$$4 -march=i686 -m32"
+        $4="$$4 -arch i386"
+        $5="$$5 -march=i686 -m32"
         ;;
     x86_64-apple-darwin)
         $2="$$2 -m64"
         $3="$$3 -m64"
-        $4="$$4 -m64"
+        $4="$$4 -arch x86_64"
+        $5="$$5 -m64"
         ;;
     esac
 
@@ -36,7 +39,8 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         # 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 -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