X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=5e503eac143e7a01dc117bb3c148cf45d688ddb7;hb=f6d9137f8ba8427bbdad0650ec96211494f43d87;hp=5cce4bc4dc2dca2758563ae0809c4068c454a8ab;hpb=35a45c7c79d1c64bf3fb57865e6bd52dca93a31a;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 5cce4bc..5e503ea 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -602,12 +602,8 @@ SRC_HC_OPTS += -package unix
 PKG_DEPENDS += unix
 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.
-ifneq "$(stage)" "1"
 SRC_HC_OPTS += -package Cabal
 PKG_DEPENDS += Cabal
-endif
 
 # Ignore lang, to avoid potential clash with the Generics module if
 # lang happens to be a dependency of some exposed package in the local
@@ -685,6 +681,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