X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=e693b2dd320df227851ad8ec20c04c69c60b7b7e;hb=351afa5ad7cc7012d5460c126cad4999e457a30d;hp=a4f8f70f275f5787d303e5c1d48b6175b1bd9205;hpb=2cc5b907318f97e19b28b2ad8ed9ff8c1f401dcc;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a4f8f70..e693b2d 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -17,9 +17,11 @@
 #	  so if you edit config.mk your changes will be spammed.
 #
 #	- Settings in this file may be overriden by giving replacement
-#	  definitions in build.mk.  If you don't have a build.mk file
-#	  then you get defaults for everything.  The defaults should
-#	  provide a reasonable vanilla build.
+#	  definitions in build.mk.  See build.mk.sample for a good
+#	  starting point for a build.mk file.
+#
+#	  If you don't have a build.mk file then you get defaults for everything.
+#	  The defaults should provide a reasonable vanilla build.
 #
 # This is one of only two files that configure generates (the other is config.h)
 #
@@ -99,9 +101,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
 # build the libs first if we're bootstrapping from .hc files
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib
+AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib haddock
 else
-AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib
+AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib haddock
 endif
 
 #
@@ -184,7 +186,7 @@ FptoolsHcOpts=-O
 #
 # NOTE: this is not the same as building the compiler itself
 # unregisterised.  That's done by either (a) bootstrapping with a
-# compiler that was built with GhcUnregisterized=YES, or (b)
+# compiler that was built with GhcUnregisterised=YES, or (b)
 # bootstrapping with a compiler that has way 'u' libraries, and the
 # flag '-unreg' is added to GhcHcOpts above.
 #
@@ -205,10 +207,12 @@ endif
 GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
+HaveRtldNext = @HaveRtldNext@
+HaveRtldLocal = @HaveRtldLocal@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
 
-ifneq "$(findstring $(HostOS_CPP), mingw32 linux solaris2 freebsd netbsd openbsd)" ""
+ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd)" ""
 GhcWithInterpreter=YES
 ifeq "$(HaveLibDL)" "YES"
 SRC_HC_OPTS += -ldl
@@ -224,7 +228,7 @@ BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 #------------------------------------------------------------------------------
-# Options for GHC's Prelude
+# Options for Libraries
 
 # What extra ways to build the libraries in
 # In addition to the normal sequential way, the default is to also build
@@ -260,6 +264,21 @@ DLLized=@EnableWin32DLLs@
 #
 MinimalUnixDeps=@MinimalUnixDeps@
 
+# Strip local symbols from libraries?  This can make the libraries smaller,
+# but makes debugging somewhat more difficult.  Doesn't work with all ld's.
+#
+StripLibraries=NO
+
+
+# ----------------------------------------------------------------------------
+# Object-file splitting
+#
+# 	Set SplitObjs=YES or NO in your build.mk
+#
+#	Don't use -split-objs in in GhcLibHcOpts, because the build
+#		system needs to do other special magic if you are
+#		doing object-file splitting
+
 # Don't split object files for libs if we're building DLLs, or booting from
 # .hc files.
 SplitObjs=YES
@@ -273,11 +292,9 @@ endif
 ifeq "$(GhcUnregisterised)" "YES"
 SplitObjs=NO
 endif
-
-# Strip local symbols from libraries?  This can make the libraries smaller,
-# but makes debugging somewhat more difficult.  Doesn't work with all ld's.
-#
-StripLibraries=NO
+ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
+SplitObjs=NO
+endif
 
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
@@ -329,9 +346,15 @@ ReadlineIncludePath=
 # Math library
 LIBM=@LIBM@
 
+# Build the ObjectIO ?
+#
+GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
+GL_CFLAGS=@GL_CFLAGS@
+GL_LIBS=@GL_LIBS@
 
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
@@ -471,6 +494,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
@@ -508,7 +535,6 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
-
 ################################################################################
 #
 #		Utilities programs: flags
@@ -580,10 +606,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/
@@ -621,6 +646,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
@@ -643,6 +671,10 @@ endif
 # default C compiler flags
 SRC_CC_OPTS = @SRC_CC_OPTS@
 
+ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
+SRC_CC_OPTS += -G0
+endif
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -650,10 +682,21 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
-# Regex library 
+# 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)
 #
-HaveRegex	= @HaveRegex@
+HavePosixRegex  = @HavePosixRegex@
+HaveGNURegex	= @HaveGNURegex@
 
 #-----------------------------------------------------------------------------
 # GTK+
@@ -708,9 +751,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@
@@ -751,11 +794,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/.
 #
@@ -823,7 +861,13 @@ HAPPY_VERSION		= @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS		= @HappyOpts@
+GHC_HAPPY_OPTS		= -agc
+
+#
+# Haddock
+# 
+HADDOCK			= @HaddockCmd@
+HADDOCK_INPLACE		= $(HADDOCK_PREFIX)/src/haddock-inplace
 
 #
 # Stuff from fptools/literate
@@ -838,8 +882,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