[project @ 2002-12-05 23:49:43 by mthomas]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a28b1bf..5cfec6f 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -164,15 +164,12 @@ GhcCompilerWays=
 #                      used to compile GHC.  Useful when bootstrapping.
 GhcHcOpts=-Rghc-timing
 
-# Extra Haskell compiler options to use when compiling all Haskell
-# *programs* (not libraries), including GHC itself.
-# Typical options to use here:
-#
-#      -H25m           use a bigger heap (to speed up compilation)
-#
-#      -O              compile an optimised compiler
-#
-FptoolsHcOpts=-O
+# Extra options added to specific stages of the compiler bootstrap.
+# These are placed later on the command line, and may therefore
+# override options from $(GhcHcOpts).
+GhcStage1HcOpts=
+GhcStage2HcOpts=
+GhcStage3HcOpts=
 
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
@@ -214,9 +211,6 @@ HaveRtldLocal = @HaveRtldLocal@
 
 ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd)" ""
 GhcWithInterpreter=YES
-ifeq "$(HaveLibDL)" "YES"
-SRC_HC_OPTS += -ldl
-endif
 else 
 GhcWithInterpreter=NO
 endif
@@ -535,7 +529,6 @@ ifeq "$(strip $(mandir))" ""
 mandir         = $(prefix)/man
 endif
 
-
 ################################################################################
 #
 #              Utilities programs: flags
@@ -552,6 +545,8 @@ endif
 #
 #      SRC_HC_OPTS += -O
 
+SRC_HC_OPTS += -H16m -O
+
 # These flags make flex 8-bit
 SRC_FLEX_OPTS  += -8
 
@@ -647,6 +642,9 @@ MKDEPENDHS  = $(GHC)
 # tree).  We can refer to "this ghc" as $(GHC_INPLACE):
 
 GHC_INPLACE    = $(FPTOOLS_TOP)/ghc/compiler/ghc-inplace
+GHC_STAGE1     = $(FPTOOLS_TOP)/ghc/compiler/stage1/ghc-inplace
+GHC_STAGE2     = $(FPTOOLS_TOP)/ghc/compiler/stage2/ghc-inplace
+GHC_STAGE3     = $(FPTOOLS_TOP)/ghc/compiler/stage3/ghc-inplace
 
 #-----------------------------------------------------------------------------
 # C compiler
@@ -685,6 +683,11 @@ LibGmp             = @LibGmp@
 HaveLibMingwEx = @HaveLibMingwEx@
 
 #-----------------------------------------------------------------------------
+# HaskellSupport framework (Mac OS X)
+#
+HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
+
+#-----------------------------------------------------------------------------
 # Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #
@@ -747,7 +750,6 @@ PERL                        = @PerlCmd@
 PYTHON                 = @PythonCmd@
 PIC                    = pic
 PREPROCESSCMD          = $(CC) -E
-PRINTER                        = lpr
 RANLIB                 = @RANLIB@
 RM                     = rm -f
 SED                    = @SedCmd@
@@ -788,11 +790,6 @@ TAR                        = @TarCmd@
 ZIP                    = zip
 
 #
-# Under Windows, we have to deal with .exe suffixes
-#
-EXE_SUFFIX=@exeext@
-
-#
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.
 #
@@ -881,8 +878,8 @@ LIT2TEXT            = $(LITERATE_PREFIX)lit2text
 #
 # Stuff from fptools/ghc/utils
 #
-UNLIT                  = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
-HP2PS                  = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
+UNLIT                  = $(UNLIT_PREFIX)unlit$(exeext)
+HP2PS                  = $(HP2PS_PREFIX)hp2ps$(exeext)
 HSTAGS                 = $(HSTAGS_PREFIX)hstags
 HSC2HS                 = $(HSC2HS_PREFIX)hsc2hs-inplace