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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1a8dc38..1cdc1b9 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -319,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@
@@ -754,14 +759,14 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
-# Mingwex Library
+# GMP framework (Mac OS X)
 #
-HaveLibMingwEx	= @HaveLibMingwEx@
+HaveFrameworkGMP = @HaveFrameworkGMP@
 
 #-----------------------------------------------------------------------------
-# HaskellSupport framework (Mac OS X)
+# Mingwex Library
 #
-HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
+HaveLibMingwEx	= @HaveLibMingwEx@
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
@@ -789,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