X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=e6410d7de5661ff573c67b432c19212daaed35cd;hb=f297744c392bf7fa10d8b692de7194dcad0b9afd;hp=4701bc93541992a5e2dc3cddfe99d0c991a0515a;hpb=c0eb9d997653da4357873829990cc338475bca39;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 4701bc9..e6410d7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6,10 +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 and $3])
+    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,11 +21,17 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         # but we don't 16-byte align things. Thus drop
         # back to generic i686 compatibility. Trac #2983.
         $2="$$2 -march=i686 -m32"
-        $3="$$3 -march=i686 -m32"
+        # It's not clear if $3 flags will be given to gcc or ld,
+        # and they accept different flags, so for now do nothing
+        # $3="$$3 -march=i686 -m32"
+        $4="$$4 -march=i686 -m32"
         ;;
     x86_64-apple-darwin)
         $2="$$2 -m64"
-        $3="$$3 -m64"
+        # It's not clear if $3 flags will be given to gcc or ld,
+        # and they accept different flags, so for now do nothing
+        # $3="$$3 -m64"
+        $4="$$4 -m64"
         ;;
     esac
 
@@ -29,7 +39,10 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
     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"
+        # It's not clear if $3 flags will be given to gcc or ld,
+        # and they accept different flags, so for now do nothing
+        # $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