More commandline flag improvements

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 14fd667..783f4f9 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -192,13 +192,18 @@ MACOSX_DEPLOYMENT_SDK = @MACOSX_DEPLOYMENT_SDK@
 
 ifneq "$(MACOSX_DEPLOYMENT_VERSION)" ""
 MACOSX_DEPLOYMENT_CC_OPTS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_VERSION) \
-                           -isysroot $(MACOSX_DEPLOYMENT_SDK)
+                           -isysroot $(MACOSX_DEPLOYMENT_SDK) \
+                           --no-builtin-fprintf
 MACOSX_DEPLOYMENT_LD_OPTS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_VERSION) \
                            -Wl,-syslibroot,$(MACOSX_DEPLOYMENT_SDK)
 # We don't extend SRC_CC_OPTS and friends here directly, as (a) they may get
 # overwritten in build.mk and (b) we must not use the deployment options in
 # stage 1 or we get a linker error if the bootstrap compiler is for a more 
 # recent OS version.
+#
+# We need --no-builtin-fprintf, as the use of the builtin function optimisation
+# for fprintf together with #include "PosixSource" in the RTS leads to the
+# use of fwrite$UNIX2003 (with GCC 4.0.1 on Mac OS X 10.5.2).
 endif
 
 ################################################################################
@@ -397,12 +402,12 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 #      -O(2) is pretty desirable, otherwise no inlining of prelude
 #              things (incl "+") happens when compiling with this compiler
 #
-#      -fgenerics switches on generation of support code for 
+#      -XGenerics switches on generation of support code for 
 #              derivable type classes.  This is now off by default,
 #              but we switch it on for the libraries so that we generate
 #              the code in case someone importing wants it
 
-GhcLibHcOpts=-O2 -Rghc-timing -fgenerics
+GhcLibHcOpts=-O2 -Rghc-timing -XGenerics
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 DLLized=@EnableWin32DLLs@
@@ -900,6 +905,7 @@ GhcMinVersion       = @GhcMinVersion@
 
 ghc_ge_605 = YES
 ghc_ge_607 = YES
+ghc_ge_609 = YES
 
 else # not UseStage1 or BootingFromHc
 
@@ -913,6 +919,7 @@ GhcMinVersion       = @GhcMinVersion@
 # Some useful GHC version predicates:
 ghc_ge_605 = @ghc_ge_605@
 ghc_ge_607 = @ghc_ge_607@
+ghc_ge_609 = @ghc_ge_609@
 endif
 
 # Canonicalised ghc version number, used for easy (integer) version