X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=4ba14bafaea51c39c4a8b7245cf14a988ba0e66e;hb=d89f0e2d2adf5ebce15984d08b1d00de60db6d78;hp=30cc466676ff0449ae0df2f50a566f4534e0b0b5;hpb=9066b64ba846709a1250dddef4119b2048797c17;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 30cc466..4ba14ba 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
 
 #
@@ -206,10 +208,11 @@ 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
@@ -225,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
@@ -261,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
@@ -274,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
@@ -474,6 +490,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
@@ -583,10 +603,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/
@@ -646,6 +665,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)
 #
@@ -653,6 +676,11 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
+# Mingwex Library
+#
+HaveLibMingwEx	= @HaveLibMingwEx@
+
+#-----------------------------------------------------------------------------
 # Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #
@@ -827,7 +855,12 @@ 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_INPLACE		= $(HADDOCK_PREFIX)/src/haddock-inplace
 
 #
 # Stuff from fptools/literate