X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=722aad2d26d590caf407ebb7c4a096e39a86fabf;hb=594aa4b52a8706d6823bbd63420d4c508c1b37ed;hp=1559cd33718221efc9b92d915bc4335d206a9866;hpb=7bac51fa2ad7eb14e31ee65ad992e7e5ab3a4be5;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1559cd3..722aad2 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -175,15 +175,8 @@ GhcHcOpts=
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
 GhcWithHscBuiltViaC=@BootingFromHc@
 
-# Build hsc with -O and turn optimising flag on when compiling
-# the intermediate C file
-GhcUseGccForOptAsm=YES
-
-# Compile intermediate C file with debugging options set.
-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
@@ -197,7 +190,6 @@ GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha s
 # Building various ways?
 # (right now, empty if not).
 BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
-BuildingProfiling=$(subst p,YES,$(filter p,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 #---------------------------------------------------------------
@@ -232,8 +224,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?
 #
@@ -244,10 +236,6 @@ GhcLibsWithReadline=NO
 #
 ReadlineIncludePath=
 
-# Build the socket libraries?  (ToDo: is this used?)
-#
-GhcLibsWithSockets=YES
-
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
 #
@@ -256,7 +244,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@
 
 #################################################################################
 #
@@ -525,7 +517,7 @@ CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
 CPP			= @CPP@
 CTAGS 			= $(ETAGS)
-RAWCPP                  = @RAWCPP@
+RAWCPP                  = $(CPP) -undef -traditional
 INSTALL			= @INSTALL@
 #
 # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
@@ -562,7 +554,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)
@@ -622,6 +614,8 @@ HAPPY_VERSION		= @HappyVersion@
 LX			= @LxCmd@
 GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 
+BLD_DLL			= dllwrap
+
 #
 # Stuff from fptools/literate
 #
@@ -703,7 +697,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
@@ -713,6 +707,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:
 #