[project @ 2002-05-22 09:02:40 by simonmar]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1ae53b7..d2a1267 100644 (file)
--- 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,6 +208,7 @@ GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
 HaveRtldNext = @HaveRtldNext@
+HaveRtldLocal = @HaveRtldLocal@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
 
@@ -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
@@ -234,7 +237,7 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 ifeq "$(BootingFromHc)" "YES"
 GhcLibWays=
 else
-GhcLibWays=
+GhcLibWays=p
 endif
 
 # Option flags to pass to GHC when it's compiling modules in
@@ -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
@@ -275,11 +293,6 @@ 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
-
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
 
@@ -827,7 +840,7 @@ 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
 
 #
 # Stuff from fptools/literate