From 40cb7f14dba9ba5aa0532dc56d941d318eaae906 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Tue, 21 Feb 2012 14:58:33 +0000
Subject: [PATCH] GHC trees no longer include the extensible-exceptions package
---
ghc.mk | 5 ++---
packages | 1 -
utils/ghc-pkg/ghc.mk | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ghc.mk b/ghc.mk
index 813267b00c58..b3f62778b40b 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -54,7 +54,7 @@
# o register each package into inplace/lib/package.conf
# * build libffi
# * With bootstrapping compiler:
-# o Build libraries/{filepath,hpc,extensible-exceptions,Cabal}
+# o Build libraries/{filepath,hpc,Cabal}
# o Build compiler (stage 1)
# * With stage 1:
# o Build libraries/*
@@ -333,7 +333,7 @@ PKGS_THAT_USE_TH := $(PKGS_THAT_ARE_DPH)
#
# We assume that the stage0 compiler has a suitable bytestring package,
# so we don't have to include it below.
-PKGS_THAT_BUILD_WITH_STAGE0 = Cabal/Cabal hpc extensible-exceptions binary bin-package-db hoopl
+PKGS_THAT_BUILD_WITH_STAGE0 = Cabal/Cabal hpc binary bin-package-db hoopl
# $(EXTRA_PACKAGES) is another classification, of packages built but
# not installed
@@ -410,7 +410,6 @@ $(eval $(call addPackage,old-time))
$(eval $(call addPackage,time))
$(eval $(call addPackage,directory))
$(eval $(call addPackage,process))
-$(eval $(call addPackage,extensible-exceptions))
$(eval $(call addPackage,haskell98))
$(eval $(call addPackage,haskell2010))
$(eval $(call addPackage,hpc))
diff --git a/packages b/packages
index 95fe33bab393..8eae5dd4d9c8 100644
--- a/packages
+++ b/packages
@@ -54,7 +54,6 @@ libraries/Cabal - packages/Cabal.git
libraries/containers - packages/containers.git git
libraries/deepseq - packages/deepseq.git git
libraries/directory - packages/directory.git git
-libraries/extensible-exceptions - packages/extensible-exceptions.git git
libraries/filepath - packages/filepath.git git
libraries/ghc-prim - packages/ghc-prim.git git
libraries/haskeline - packages/haskeline.git git
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index b4302cc8e0e8..11b7c8f26a35 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -63,7 +63,6 @@ utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/
-XCPP -XExistentialQuantification -XDeriveDataTypeable \
-ilibraries/Cabal/Cabal \
-ilibraries/filepath \
- -ilibraries/extensible-exceptions \
-ilibraries/hpc \
-ilibraries/binary/src \
-ilibraries/bin-package-db
--
GitLab