X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=09ef225166c12b3fea06eb871da85dc3a22ff392;hb=1ddce51848468501577f36119920e9e32e93fba8;hp=3e673f92b825f45dcfd6d843bf0f5a4c040b1a02;hpb=819dbcb57fe84f8e9777d4eb63e6c2ba7134691f;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 3e673f9..09ef225 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6,9 +6,15 @@
 
 # FPTOOLS_SET_C_LD_FLAGS
 # ----------------------------------
-# Set the C and LD flags for a given platform
+# Set the C, LD and CPP flags for a given platform
+# $1 is the platform
+# $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, $4 and $5])
     case $$1 in
     i386-apple-darwin)
         # By default, gcc on OS X will generate SSE
@@ -17,10 +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 -arch i386"
+        $5="$$5 -march=i686 -m32"
         ;;
     x86_64-apple-darwin)
         $2="$$2 -m64"
         $3="$$3 -m64"
+        $4="$$4 -arch x86_64"
+        $5="$$5 -m64"
         ;;
     esac
 
@@ -29,6 +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  -macosx_version_min 10.5"
+        $5="$$5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
         ;;
     esac
 
@@ -40,6 +52,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         $2="$$2 -fno-stack-protector"
     fi
     rm -f conftest.c conftest.o
+    AC_MSG_RESULT([done])
 ])