X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ab4fd5acbac769874727b57968faef1e0d433554;hb=df6c390f4f4401a7a2c2e81eb72eb9c3732bd693;hp=9be5f3f146173739b84f361350efafec09935dab;hpb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 9be5f3f..ab4fd5a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -149,6 +149,10 @@ IncludeTestDirsInBuild=NO
 
 WithGhcHc = @WithGhcHc@
 
+# Variable which is set to the version number of the $(WithGhcHc) we're using.
+# Not currently used, but might come in handy sometime soon.
+#WithGhcHcVersion = $(shell echo `if ( $(WithGhcHc) --version 2>/dev/null >/dev/null ) then $(WithGhcHc) --version 2>&1 | @SedCmd@ -e 's/^.*version [^0-9]*\([.0-9]*\).*/\1/;s/\.//'; else echo unknown; fi; ` )
+
 # Extra ways in which to build the compiler (for example, you might want to
 # build a profiled compiler so you can see where it spends its time)
 GhcCompilerWays=
@@ -179,7 +183,7 @@ GhcUseGccForOptAsm=YES
 GhcUseGccForDebuggingAsm=YES
 
 # Build a registerised version of hsc and runtime
-# (you'd be desperate or silly not to).
+# (unregisterised used for Hugs at the moment)
 GhcWithRegisterised=YES
 
 # Build a compiler with a native code generator backend
@@ -228,8 +232,8 @@ endif
 # GhcRtsHcOpts is used when compiling .hc files.
 # GhcRtsCcOpts is used when compiling .c  files.
 
-GhcRtsHcOpts=
-GhcRtsCcOpts=
+GhcRtsHcOpts=-O2
+GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
 
 # Build the Haskell Readline bindings?
 #
@@ -252,7 +256,11 @@ StripLibraries=NO
 # Include compiler support for letting the compiler (optionally) report
 # your compilation to a central server for generation of fun stats.
 #
-GhcReportCompiles=YES
+GhcReportCompiles=NO
+
+# Win32 only: Enable the RTS and libraries to be built as DLLs
+#
+EnableWin32DLLs=@EnableWin32DLLs@
 
 #################################################################################
 #
@@ -268,7 +276,7 @@ WithHappyHc = $(WithGhcHc)
 # HappyHcOpts gives the flags to pass to the Haskell compiler used
 # 	      to compile the Happy sources with.
 #
-HappyHcOpts = 
+HappyHcOpts = -O
 
 #################################################################################
 #
@@ -558,7 +566,7 @@ SHELL			= /bin/sh
 # override whatever setting you have in your environment while executing. 
 
 # By default, REAL_SHELL is set equal SHELL, which is not really a smart move
-# as it SHELL that will show up the bogosity in the first place, but setting
+# as it is SHELL that will show up the bogosity in the first place, but setting
 # it to anything else isn't really portable.
 #
 #  ====> If long command lines cause you trouble, invoke `ghc' (via `make' or otherwise)
@@ -618,6 +626,8 @@ HAPPY_VERSION		= @HappyVersion@
 LX			= @LxCmd@
 GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 
+BLD_DLL			= dllwrap
+
 #
 # Stuff from fptools/literate
 #
@@ -699,7 +709,7 @@ WAY_t_HC_OPTS= -ticky
 
 # Way `u':
 WAY_u_NAME=unregisterized (using portable C only)
-WAY_u_HC_OPTS=
+WAY_u_HC_OPTS=-unreg
 
 # Way `mp': 
 WAY_mp_NAME=parallel
@@ -709,6 +719,10 @@ WAY_mp_HC_OPTS=-parallel
 WAY_mg_NAME=GranSim
 WAY_mg_HC_OPTS=-gransim
 
+# Way `dll': 
+WAY_dll_NAME=Win32 DLLs
+WAY_dll_HC_OPTS=
+
 #
 # Add user-way configurations here:
 #