X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=84fb2b1a476b7cbd7432c221d80226cedcb7a1a3;hb=a59f5d6552674928879cae0d225e6052876d5ca4;hp=288fd8320855b4ab28c6e63e00e2a0df5670f629;hpb=b6fff39114fee90b806ed2e29cc8f5d9728d85a8;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 288fd83..84fb2b1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6,9 +6,14 @@
 
 # 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 C flags variable
+# $3 is the name of the LD flags variable
+# $4 is the name of the CPP flags variable
 AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
 [
+    AC_MSG_CHECKING([Setting up $2, $3 and $4])
     case $$1 in
     i386-apple-darwin)
         # By default, gcc on OS X will generate SSE
@@ -17,10 +22,21 @@ 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"
         ;;
     x86_64-apple-darwin)
         $2="$$2 -m64"
         $3="$$3 -m64"
+        $4="$$4 -m64"
+        ;;
+    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 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
         ;;
     esac
 
@@ -31,7 +47,8 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
     then
         $2="$$2 -fno-stack-protector"
     fi
-    rm conftest.c conftest.o
+    rm -f conftest.c conftest.o
+    AC_MSG_RESULT([done])
 ])