X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=ce69bae2f24087d5f7b80219447288c721af8490;hb=9a657491d1caf6e29c85ce71e95a36eea3e036b1;hp=fdde6f8a4b1e1321b66a1f69fcb1127aaea969e7;hpb=0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index fdde6f8..ce69bae 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -598,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.
@@ -648,8 +644,6 @@ ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
 endif
 
-utils/Digraph_HC_OPTS		= -fglasgow-exts 
-
 # basicTypes/SrcLoc_HC_OPTS	= -funbox-strict-fields
 
 # We always optimise some low-level modules, otherwise performance of
@@ -691,6 +685,10 @@ parser/Lexer_HC_OPTS += -funbox-strict-fields
 # prototype via a global option instead of a myriad of per-file OPTIONS
 SRC_HC_OPTS += '-\#include "cutils.h"'
 
+ifeq "$(ghc_ge_605)" "NO"
+utils/LazyUniqFM_HC_OPTS += -fallow-undecidable-instances
+endif
+
 # ----------------------------------------------------------------------------
 #		Generate supporting stuff for prelude/PrimOp.lhs 
 #		from prelude/primops.txt