projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ghc-cabal now adds the language flag being used
[ghc-hetmet.git]
/
aclocal.m4
diff --git
a/aclocal.m4
b/aclocal.m4
index
3e673f9
..
84fb2b1
100644
(file)
--- a/
aclocal.m4
+++ b/
aclocal.m4
@@
-6,9
+6,14
@@
# FPTOOLS_SET_C_LD_FLAGS
# ----------------------------------
# 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_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
case $$1 in
i386-apple-darwin)
# By default, gcc on OS X will generate SSE
@@
-17,10
+22,12
@@
AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
# back to generic i686 compatibility. Trac #2983.
$2="$$2 -march=i686 -m32"
$3="$$3 -march=i686 -m32"
# 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"
;;
x86_64-apple-darwin)
$2="$$2 -m64"
$3="$$3 -m64"
+ $4="$$4 -m64"
;;
esac
;;
esac
@@
-29,6
+36,7
@@
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"
# 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
;;
esac
@@
-40,6
+48,7
@@
AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
$2="$$2 -fno-stack-protector"
fi
rm -f conftest.c conftest.o
$2="$$2 -fno-stack-protector"
fi
rm -f conftest.c conftest.o
+ AC_MSG_RESULT([done])
])
])