From: Ian Lynagh <igloo@earth.li>
Date: Fri, 15 May 2009 20:51:22 +0000 (+0000)
Subject: Make dph required
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e86d72733e4eeda752a1b0b2874dd58090eae197;p=ghc-hetmet.git

Make dph required
---

diff --git a/darcs-all b/darcs-all
index 9477d46..e8a1139 100644
--- a/darcs-all
+++ b/darcs-all
@@ -4,11 +4,10 @@ use strict;
 
 # Usage:
 #
-# ./darcs-all [-q] [-s] [--dph] [--nofib] [--testsuite] get [darcs get flags]
+# ./darcs-all [-q] [-s] [--nofib] [--testsuite] get [darcs get flags]
 #   This gets the GHC core repos, if they do not already exist.
 #   -q says to be quite, and -s to be silent.
-#   --dph, --nofib, --testsuite also get the dph library, nofib and
-#                               testsuite repos respectively
+#   --nofib, --testsuite also get the nofib and testsuite repos respectively
 #   The darcs get flag you are most likely to want is --complete. By
 #   default we pass darcs the --partial flag.
 #
@@ -171,11 +170,6 @@ sub main {
         elsif ($arg eq "-s") {
             $verbose = 0;
         }
-        # --dph says we grab the dph libs with 'get'.
-        # It has no effect on the other commands.
-        elsif ($arg eq "--dph") {
-            $tags{"dph"} = 1;
-        }
         # --nofib tells get to also grab the nofib repo.
         # It has no effect on the other commands.
         elsif ($arg eq "--nofib") {
diff --git a/ghc.mk b/ghc.mk
index 2fdc0ce..f251635 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -320,7 +320,6 @@ endif
 
 PACKAGES += haskeline
 
-ifneq "$(wildcard libraries/dph)" ""
 PACKAGES_STAGE2 += \
 	dph/dph-base \
 	dph/dph-prim-interface \
@@ -328,7 +327,6 @@ PACKAGES_STAGE2 += \
 	dph/dph-prim-par \
 	dph/dph-seq \
 	dph/dph-par
-endif
 
 BOOT_PKGS = Cabal hpc extensible-exceptions
 
@@ -488,6 +486,7 @@ BUILD_DIRS += \
    utils/haddock/doc \
    $(patsubst %, libraries/%, $(PACKAGES)) \
    $(patsubst %, libraries/%, $(PACKAGES_STAGE2)) \
+   libraries/dph \
    compiler \
    $(GHC_HSC2HS_DIR) \
    $(GHC_PKG_DIR) \
@@ -531,9 +530,6 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
   libraries/$(lib)_dist-install_DISABLE = YES))
 endif
 
-ifneq "$(wildcard libraries/dph)" ""
-include libraries/dph/ghc.mk
-endif
 include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
 
 # We need -fno-warn-deprecated-flags to avoid failure with -Werror
diff --git a/packages b/packages
index cfc0cb0..48fabc2 100644
--- a/packages
+++ b/packages
@@ -26,6 +26,7 @@ libraries/bytestring                    packages/bytestring             darcs
 libraries/Cabal                         packages/Cabal                  darcs
 libraries/containers                    packages/containers             darcs
 libraries/directory                     packages/directory              darcs
+libraries/dph                           packages/dph                    darcs
 libraries/extensible-exceptions         packages/extensible-exceptions  darcs
 libraries/filepath                      packages/filepath               darcs
 libraries/ghc-prim                      packages/ghc-prim               darcs
@@ -46,6 +47,5 @@ libraries/terminfo                      packages/terminfo               darcs
 libraries/unix                          packages/unix                   darcs
 libraries/utf8-string                   packages/utf8-string            darcs
 libraries/Win32                         packages/Win32                  darcs
-libraries/dph               dph         packages/dph                    darcs
 testsuite                   testsuite   testsuite                       darcs
 nofib                       nofib       nofib                           darcs