[project @ 1999-10-15 08:56:46 by simonmar]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1559cd3..64bbc65 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -147,7 +147,7 @@ IncludeTestDirsInBuild=NO
 #                           HC_ROJEMO_NHC
 #                           HC_UNSPECIFIED
 
-WithGhcHc = @WithGhcHc@
+WithGhcHc = @WithHc@
 
 # Variable which is set to the version number of the $(WithGhcHc) we're using.
 # Not currently used, but might come in handy sometime soon.
@@ -160,11 +160,9 @@ GhcCompilerWays=
 # Extra option flags to pass to the compiler that compiles the compiler
 # (Ones that are essential are wired into ghc/compiler/Makefile)
 # Typical ones:
-#      -H25m           allocate a bigger heap (default is 6m)
+#      -H25m           allocate a bigger heap (might speed up compilation)
 #
 #      -O              compile an optimised compiler
-#                      NB! If you add -O you'll almost certainly need to increase
-#                      the amount of heap space too (to 15m or more)
 #
 #      -DDEBUG         include consistency/assertion checks in the compiled compiler
 #
@@ -175,15 +173,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 +188,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 +222,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 +234,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 +242,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@
 
 #################################################################################
 #
@@ -267,7 +257,7 @@ GhcReportCompiles=YES
 #################################################################################
 
 # The compiler you'd like to use to compile Happy
-WithHappyHc = $(WithGhcHc)
+WithHappyHc = @WithHc@
 
 # HappyHcOpts gives the flags to pass to the Haskell compiler used
 #            to compile the Happy sources with.
@@ -477,7 +467,8 @@ HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
 #-----------------------------------------------------------------------------
 # Haskell compiler and mkdependHS
 
-HC             = $(FPTOOLS_TOP)/ghc/driver/ghc
+# ToDo: $(HC) should be a local installation of some Haskell compiler
+HC             = $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
 MKDEPENDHS     = $(HC)
 
 #-----------------------------------------------------------------------------
@@ -525,7 +516,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 +553,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 +613,8 @@ HAPPY_VERSION               = @HappyVersion@
 LX                     = @LxCmd@
 GREENCARD              = $(FPTOOLS_TOP)/green-card/src/green-card
 
+BLD_DLL                        = dllwrap
+
 #
 # Stuff from fptools/literate
 #
@@ -703,7 +696,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 +706,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:
 #