X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=acace59fdfeee8a7c3b2cc171fa9d50f3933570b;hb=a370654a872838c43e63bdd6cc279c0ee9913cdf;hp=d2195c74a1b314c0248ebd81c9ca5074019b72a7;hpb=5b87f4c4cdfb303d3d4c408ca94a9e94b644da5b;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index d2195c7..acace59 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -568,9 +568,13 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
 
-SRC_HC_OPTS += \
-  -cpp -fglasgow-exts -fno-generics -Rghc-timing \
-  -I. -Iparser -Iutil
+SRC_HC_OPTS += -cpp -fglasgow-exts -Rghc-timing -I. -Iparser -Iutil
+
+ifeq "$(ghc_ge_609)" "NO"
+SRC_HC_OPTS += -fno-generics
+else
+SRC_HC_OPTS += -XNoGenerics
+endif
 
 # Omitted: 	-I$(GHC_INCLUDE_DIR)
 # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, 
@@ -594,13 +598,9 @@ SRC_HC_OPTS += -package Win32
 PKG_DEPENDS += Win32
 endif
 else
-ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO"
-SRC_HC_OPTS += -package posix
-else
 SRC_HC_OPTS += -package unix
 PKG_DEPENDS += unix
 endif
-endif
 
 # We use the Cabal package in stages 2/3 only; in stage 1 we're using
 # the libcompat library which provides the Cabal modules.
@@ -626,7 +626,7 @@ endif
 #	The standard suffix rule for compiling a Haskell file
 #	adds these flags to the command line
 
-# There used to be a -no-recomp flag on PrimOp, but why?
+# There used to be a -fforce-recomp flag on PrimOp, but why?
 # It's an expensive module to recompile!
 prelude/PrimOp_HC_OPTS 		= -H80m
 
@@ -1042,7 +1042,7 @@ endif
 # careful to recompile stuff you need if you reconfigure or change HsVersions.h.
 
 # Aargh, these don't work properly anyway, because GHC's recompilation checker
-# just reports "compilation NOT required".  Do we have to add -no-recomp for each
+# just reports "compilation NOT required".  Do we have to add -fforce-recomp for each
 # of these .hs files?  I haven't done anything about this yet.
 
 $(odir)/codeGen/Bitmap.$(way_)o		:  ../includes/MachDeps.h