summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2010-09-23 10:45:42 +0000
committerSimon Marlow <marlowsd@gmail.com>2010-09-23 10:45:42 +0000
commita613254621412c595207bcc5681e0f2a3e5ce7d0 (patch)
treeb8e0b14849afece23c55e2e805520abd33b1629a /ghc.mk
parent1c1ed8694bdd24b003fa5935d001a1835e9b0f4e (diff)
downloadhaskell-a613254621412c595207bcc5681e0f2a3e5ce7d0.tar.gz
Add primitive and vector packages for DPH support
DPH is now using the public vector package instead of its internal version. vector and primitive are not "boot" packages; they aren't required to build GHC, but they are required to validate (because we include DPH when validating). If you say './darcs-all get --no-dph' then you don't get DPH, vector, or primitive.
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/ghc.mk b/ghc.mk
index 56ab9908af..8fb95d0689 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -294,7 +294,8 @@ INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
# because they use TH and/or annotations, or depend on other stage2
# packages.
STAGE2_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
- dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq
+ dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \
+ vector
# Packages that are built by stage0, in addition to stage1. These
# packages are dependencies of GHC, that we do not assume the stage0
@@ -373,9 +374,7 @@ $(eval $(call addPackage,bin-package-db))
$(eval $(call addPackage,mtl))
$(eval $(call addPackage,utf8-string))
$(eval $(call addPackage,xhtml))
-
$(eval $(call addPackage,terminfo,($$(Windows),NO)))
-
$(eval $(call addPackage,haskeline))
$(eval $(call extra-packages))