Revert "Don't build dph for now: it doesn't work (#5360)"
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>
Sun, 31 Jul 2011 07:37:38 +0000 (17:37 +1000)
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>
Sun, 31 Jul 2011 07:37:38 +0000 (17:37 +1000)
This reverts commit e44c591cac5aba8c7718261275db925bc2db9753.

ghc.mk
validate

diff --git a/ghc.mk b/ghc.mk
index cbf4164..b359ecc 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -295,11 +295,9 @@ include rules/bindist.mk
 # Packages that are built but not installed
 INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
 
-# We don't build dph for now (#5360)
-# DPH_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 \
-#                 vector primitive random
-DPH_PACKAGES := vector primitive random
+DPH_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 \
+                vector primitive random
 
 # Packages that, if present, must be built by the stage2 compiler,
 # because they use TH and/or annotations, or depend on other stage2
index 2dbf47b..facee1c 100755 (executable)
--- a/validate
+++ b/validate
@@ -80,9 +80,7 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    # We don't require dph for now (#5360)
-    # /usr/bin/perl -w boot --validate --required-tag=dph
-    /usr/bin/perl -w boot --validate
+    /usr/bin/perl -w boot --validate --required-tag=dph
     ./configure --prefix="$INSTDIR" $config_args
 fi