X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=5cfec6f21035c1e206c34e6db5c41e071cf019ff;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hp=ad682b8e57327bdc246e70c109ea619fe7362b29;hpb=af046f8e29bf34b5778c5839d956298cb9584fd7;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ad682b8..5cfec6f 100644
--- 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
@@ -346,6 +340,10 @@ ReadlineIncludePath=
 # Math library
 LIBM=@LIBM@
 
+# Build the ObjectIO ?
+#
+GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@ -490,6 +488,10 @@ libdir	   = $(libdir0)
 datadir    = $(datadir0)
 endif
 
+# Default place for putting interface files is $(libdir)
+# (overriden for packages in package.mk)
+ifacedir   = $(libdir)
+
 # 
 # Default values for most of the above are only set if
 # they weren't configured to anything in particular
@@ -527,7 +529,6 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
-
 ################################################################################
 #
 #		Utilities programs: flags
@@ -544,6 +545,8 @@ endif
 #
 #	SRC_HC_OPTS += -O
 
+SRC_HC_OPTS += -H16m -O
+
 # These flags make flex 8-bit
 SRC_FLEX_OPTS	+= -8
 
@@ -599,10 +602,9 @@ LNDIR_PREFIX		= $(GLAFP_UTILS)/lndir/
 MKDIRHIER_PREFIX	= $(GLAFP_UTILS)/mkdirhier/
 DOCBOOK_PREFIX		= $(GLAFP_UTILS)/docbook/
 
-LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
+HADDOCK_PREFIX		= $(FPTOOLS_TOP)/haddock/
 
-HAPPY_PREFIX    	= $(FPTOOLS_TOP)/happy/src/
-GREENCARD_PREFIX	= $(FPTOOLS_TOP)/green-card/src/
+LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
 
 UNLIT_PREFIX    	= $(FPTOOLS_TOP)/ghc/utils/unlit/
 HP2PS_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
@@ -640,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
@@ -673,6 +678,16 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
+# Mingwex Library
+#
+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)
 #
@@ -732,9 +747,9 @@ MSMACROS 		= -ms
 MV			= mv
 NROFF			= nroff
 PERL 			= @PerlCmd@
+PYTHON			= @PythonCmd@
 PIC			= pic
 PREPROCESSCMD		= $(CC) -E
-PRINTER			= lpr
 RANLIB			= @RANLIB@
 RM			= rm -f
 SED			= @SedCmd@
@@ -775,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/.
 #
@@ -850,6 +860,12 @@ HAPPY_VERSION		= @HappyVersion@
 GHC_HAPPY_OPTS		= -agc
 
 #
+# Haddock
+# 
+HADDOCK			= @HaddockCmd@
+HADDOCK_INPLACE		= $(HADDOCK_PREFIX)/src/haddock-inplace
+
+#
 # Stuff from fptools/literate
 #
 LIT2PGM 		= $(LITERATE_PREFIX)lit2pgm
@@ -862,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