X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=1cdc1b9cec8e7e1d5665919982daef5d6501ac57;hb=f97dcf9fc2ea2a419087bca53f2fea811c5181a9;hp=27dc20acb50506c191e60243eae06f3fe492592a;hpb=f13895fc3b7a38c909ee0d2d7c1de24381858024;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 27dc20a..1cdc1b9 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -56,6 +56,13 @@
 # will be built as HC files for the target system, and likely won't
 # build on this host platform.
 #
+# An important invariant is that for any piece of source code, the
+# platform on which the code is going to run is the HOST platform,
+# and the platform on which we are building is the BUILD platform.
+# Additionally for the compiler, the platform this compiler will
+# generate code for is the TARGET.  TARGET is not meaningful outside
+# the compiler sources.
+#
 # Guidelines for when to use HOST vs. TARGET:
 #
 #  - In the build system (Makefile, foo.mk), normally we should test
@@ -65,11 +72,10 @@
 #
 #  - In the compiler itself, we should test HOST or TARGET depending
 #    on whether the conditional relates to the code being generated, or
-#    the platform on which the compiler is running.  For stage 2,
-#    HOSTPLATFORM should be reset to be TARGETPLATFORM (we currently
-#    don't do this, but we should).
+#    the platform on which the compiler is running.  See the section
+#    on "Coding Style" in the commentary for more details.
 #
-#  - In the RTS and library code, we should be testing TARGET only.
+#  - In all other code, we should be testing HOST only.
 #
 # NOTE: cross-compiling is not well supported by the build system.
 # You have to do a lot of work by hand to cross compile: see the
@@ -296,6 +302,7 @@ endif
 #   thr_p       : threaded profiled
 #   debug       : debugging (compile with -g for the C compiler, and -DDEBUG)
 #   debug_p     : debugging profiled
+#   debug_u     : debugging unregisterised
 #   thr_debug   : debugging threaded
 #   thr_debug_p : debugging threaded profiled
 #
@@ -312,8 +319,13 @@ endif
 #
 # 	-O is pretty desirable, otherwise no inlining of prelude
 #		things (incl "+") happens when compiling with this compiler
+#
+#	-fgenerics switches on generation of support code for 
+#		derivable type classes.  This is now off by default,
+#		but we switch it on for the libraries so that we generate
+#		the code in case someone importing wants it
 
-GhcLibHcOpts=-O -Rghc-timing
+GhcLibHcOpts=-O -Rghc-timing -fgenerics
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 DLLized=@EnableWin32DLLs@
@@ -747,20 +759,14 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
-# Mingwex Library
-#
-HaveLibMingwEx	= @HaveLibMingwEx@
-
-#-----------------------------------------------------------------------------
-# HaskellSupport framework (Mac OS X)
+# GMP framework (Mac OS X)
 #
-HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
+HaveFrameworkGMP = @HaveFrameworkGMP@
 
 #-----------------------------------------------------------------------------
-# Regex library
-# (if present in libc use that one, otherwise use the one in the tree)
+# Mingwex Library
 #
-HavePosixRegex  = @HavePosixRegex@
+HaveLibMingwEx	= @HaveLibMingwEx@
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
@@ -788,6 +794,7 @@ CTAGS 			= $(ETAGS)
 #
 RAWCPP_FLAGS            = -undef -traditional
 FIND			= @FindCmd@
+SORT		        = @SortCmd@
 INSTALL			= @INSTALL@
 #
 # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
@@ -1056,6 +1063,10 @@ WAY_debug_HC_OPTS=-optc-DDEBUG
 WAY_debug_p_NAME=debug profiled
 WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
 
+# Way 'debug_u':
+WAY_debug_u_NAME=debug unregisterised
+WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg
+
 # Way 'thr_debug':
 WAY_thr_debug_NAME=threaded
 WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG