From 8b5a06b88e202d770e40208b7468a0f7a32668f1 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 10 May 2005 10:08:50 +0000 Subject: [PATCH] [project @ 2005-05-10 10:08:50 by simonmar] -ignore-package lang if GHC >= 6.3, fixes build breakage if wxHaskell is installed. --- ghc/compiler/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 769a673..062791e 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -496,6 +496,13 @@ SRC_HC_OPTS += -package Cabal PKG_DEPENDS += Cabal endif +ifeq "$(ghc_ge_603)" "YES" +# Ignore lang, to avoid potential clash with the Generics module if +# lang happens to be a dependency of some exposed package in the local +# GHC installation (eg. wxHaskell did this around 6.4). +SRC_HC_OPTS += -ignore-package lang +endif + SRC_CC_OPTS += -Iparser -I. -O SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts) SRC_HC_OPTS += -H16M -- 1.7.10.4