X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=12795234b8d54ab15ea9daa1fc4195bf5af68337;hp=7d0e025eb0fefa63a5cee25ab6600ab1aeb4f819;hb=9f592bb0ae0dc76bd3ec7729474057d2069bb4db;hpb=dab5f1b5a1df0fdff2c9942ca311616ad472adcd

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7d0e025..1279523 100644
--- 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
 
 ################################################################################
@@ -231,8 +236,8 @@ GhcHcOpts=-Rghc-timing
 # These are placed later on the command line, and may therefore
 # override options from $(GhcHcOpts).
 GhcStage1HcOpts=
-GhcStage2HcOpts=
-GhcStage3HcOpts=
+GhcStage2HcOpts=-O2
+GhcStage3HcOpts=-O2
 
 GhcProfiled=NO
 GhcDebugged=NO
@@ -349,6 +354,9 @@ MakefileDeps=YES
 #------------------------------------------------------------------------------
 # Options for Libraries
 
+# Which directory (in libraries/) contains the integer library?
+INTEGER_LIBRARY=integer-gmp
+
 # What extra ways to build the libraries in
 # In addition to the normal sequential way, the default is to also build
 # profiled prelude libraries.
@@ -391,7 +399,7 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 # -dcore-lint or -H32m.  The ones that are *essential* are wired into
 # the build system.
 #
-# 	-O is pretty desirable, otherwise no inlining of prelude
+# 	-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 
@@ -399,7 +407,7 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 #		but we switch it on for the libraries so that we generate
 #		the code in case someone importing wants it
 
-GhcLibHcOpts=-O -Rghc-timing -fgenerics
+GhcLibHcOpts=-O2 -Rghc-timing -fgenerics
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 DLLized=@EnableWin32DLLs@
@@ -681,7 +689,7 @@ INSTALL_DIR     = $(MKDIRHIER)
 #
 #	SRC_HC_OPTS += -O
 
-SRC_HC_OPTS += -H16m -O
+SRC_HC_OPTS += -H32m -O
 
 # These flags make flex 8-bit
 SRC_FLEX_OPTS	+= -8
@@ -1231,7 +1239,7 @@ WAY_thr_debug_NAME=threaded
 WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG
 
 # Way 'thr_debug_p':
-WAY_thr_debug_p_NAME=threaded
+WAY_thr_debug_p_NAME=threaded debug profiling
 WAY_thr_debug_p_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -prof
 
 # Way 'dyn': build dynamic shared libraries