[project @ 2001-07-25 10:10:25 by simonmar]

- Move FptoolsHcOpts out of the hslibs section of this file (which was
  *exactly* the wrong place for it).

- Clarify the meaning of FptoolsHcOpts and GhcHcOpts.

NOTE: $(FptoolsHcOpts) gets added to every Haskell compilation for
Haskell *programs* (not libraries), including GHC itself.  By default,
it contains only -O.  To remove the -O, you need to override
FptoolsHcOpts in build.mk, not GhcHcOpts.

GhcHcOpts is still there, and contains options to be added when
compiling GHC only.

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a0eb257..8ba1bc9 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -152,16 +152,26 @@ GhcCompilerWays=
 
 # Extra option flags to pass to the compiler that compiles the compiler
 # (Ones that are essential are wired into ghc/compiler/Makefile)
-# Typical ones:
-#      -H25m           allocate a bigger heap (might speed up compilation)
+# Typical options to use here:
 #
-#      -O              compile an optimised compiler
-#
-#      -DDEBUG         include consistency/assertion checks in the compiled compiler
+#      -DDEBUG         include debugging code and assertions (will make the
+#                      compiler slower and produce debugging output, but useful
+#                      for development)
 #
 #      -dcore-lint     check the types after every pass of the compiler;
-#                      a pretty strong internal check
-GhcHcOpts=-O -Rghc-timing
+#                      a pretty strong internal check of the compiler being
+#                      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
 
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
@@ -302,9 +312,6 @@ HsLibsFor   = ghc
 # hslibs for GHC also uses the following variables (defined above):
 #   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, DLLized, StripLibraries
 
-# Haskell compiler options for tools in fptools
-FptoolsHcOpts=-O
-
 # Build the Haskell Readline bindings?
 #
 GhcLibsWithReadline=@HaveReadlineHeaders@