X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=e19a1cdc30f46ad0cc8e35af8c5d7789c77efced;hb=12c1559835a971b49042929b77c41ae6c3f8360b;hp=12795234b8d54ab15ea9daa1fc4195bf5af68337;hpb=9f592bb0ae0dc76bd3ec7729474057d2069bb4db;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1279523..e19a1cd 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -402,12 +402,12 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 # 	-O(2) is pretty desirable, otherwise no inlining of prelude
 #		things (incl "+") happens when compiling with this compiler
 #
-#	-fgenerics switches on generation of support code for 
+#	-XGenerics 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=-O2 -Rghc-timing -fgenerics
+GhcLibHcOpts=-O2 -Rghc-timing -XGenerics
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 DLLized=@EnableWin32DLLs@
@@ -468,7 +468,8 @@ GhcRtsWithFrontPanel = NO
 # Include support for CPU performance counters via the PAPI library in the RTS?
 # (PAPI: http://icl.cs.utk.edu/papi/)
 GhcRtsWithPapi = NO
-HavePapi = @HavePapi@
+PapiLibDir=
+PapiIncludeDir=
 
 ################################################################################
 #
@@ -905,6 +906,7 @@ GhcMinVersion	= @GhcMinVersion@
 
 ghc_ge_605 = YES
 ghc_ge_607 = YES
+ghc_ge_609 = YES
 
 else # not UseStage1 or BootingFromHc
 
@@ -918,6 +920,7 @@ GhcMinVersion	= @GhcMinVersion@
 # Some useful GHC version predicates:
 ghc_ge_605 = @ghc_ge_605@
 ghc_ge_607 = @ghc_ge_607@
+ghc_ge_609 = @ghc_ge_609@
 endif
 
 # Canonicalised ghc version number, used for easy (integer) version