X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ac92a526de71fa9c8efa72105935afffd7dda0d4;hb=a370654a872838c43e63bdd6cc279c0ee9913cdf;hp=9b5c7dea48783d06e2bd42e22ea5dc676431e342;hpb=20d0ce2f990864da1a8330c363c9bfd7afa69dbd;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 9b5c7de..ac92a52 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -75,6 +75,10 @@ SUBDIRS += $(wildcard ObjectIO)
 endif
 SUBDIRS += $(wildcard parallel)
 SUBDIRS_BUILD += $(wildcard ndp)
+SUBDIRS_BUILD += $(wildcard dph/dph-base)
+SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq)
+SUBDIRS_BUILD += $(wildcard dph/dph-prim-par)
+SUBDIRS_BUILD += $(wildcard dph/dph)
 endif
 
 SUBDIRS += $(SUBDIRS_BUILD)
@@ -86,6 +90,10 @@ space=$(empty) $(empty)
 
 # -----------------------------------------------------------------------------
 
+ifeq "$(ghc_ge_609)" "YES"
+GhcLibHcOpts += -fno-warn-deprecated-flags
+endif
+
 ifeq "$(RelocatableBuild)" "YES"
 # On Windows we want to make moveable bindists, but we need to tell
 # ghc-pkg where the haddock docs are. Therefore we completely ignore
@@ -164,8 +172,7 @@ boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
 
 # We ought to be depending on %/Setup.*hs, but make makes that difficult.
 
-# -fffi is only needed for GHC 6.4 at the time of writing
-CABAL_GHC_FLAGS = -Wall -cpp -fffi
+CABAL_GHC_FLAGS = -Wall
 
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
 %/setup/Setup: $(BOOTSTRAP_STAMPS)