X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=3214c656e24d1c12f2237335ec96e16ce842f9f1;hb=949499484225617839916e6aba414f9f3b38aab1;hp=1c41a4a3d60d3a8a40bcd6d0e6983a69f14a5c3a;hpb=521a4e011066a6bad5923f15468505825632f112;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 1c41a4a..3214c65 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -147,6 +147,11 @@ endif
 endif
 
 # -----------------------------------------------------------------------------
+# Utility definitions
+
+include rules/make-command.mk
+
+# -----------------------------------------------------------------------------
 # Macros for standard targets
 
 include rules/all-target.mk
@@ -344,15 +349,28 @@ $(eval $(call addPackage,haskeline))
 
 $(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg))))
 
-ifneq "$(BootingFromHc)" "YES"
-PACKAGES_STAGE2 += \
-	dph/dph-base \
+
+# -------------------  Adding DPH packaes ---------------
+DPH_PACKAGES = 	dph/dph-base \
 	dph/dph-prim-interface \
 	dph/dph-prim-seq \
 	dph/dph-prim-par \
 	dph/dph-seq \
 	dph/dph-par
-endif
+ifneq "$(BootingFromHc)" "YES"
+ifeq "$(CLEANING)" "YES"
+# If we are cleaning we must add DPH packages regardless,
+# for reasons we now forget
+PACKAGES_STAGE2 += $(DPH_PACKAGES)
+else # not CLEANING
+ifneq "$(GhcProfiled)" "YES"
+# DPH uses Template Haskell, and Template Haskell doesn't work
+# with a profiled compiler. So if stage-2 is profile, don't build DPH
+PACKAGES_STAGE2 += $(DPH_PACKAGES)
+endif  # GhcProfiled
+endif  # Cleaning
+endif  # BootingFromHc
+# ------------------------------------------------------- 
 
 # We assume that the stage0 compiler has a suitable bytestring package,
 # so we don't have to include it below.
@@ -520,6 +538,7 @@ BUILD_DIRS += \
    driver \
    driver/ghci \
    driver/ghc \
+   driver/haddock \
    libffi \
    includes \
    rts
@@ -531,11 +550,9 @@ BUILD_DIRS += \
    $(GHC_GENAPPLY_DIR)
 endif
 
-ifneq "$(HADDOCK_DOCS)" "NO"
 BUILD_DIRS += \
    utils/haddock \
    utils/haddock/doc
-endif
 
 ifneq "$(CLEANING)" "YES"
 BUILD_DIRS += \
@@ -565,6 +582,11 @@ BUILD_DIRS += \
    $(GHC_TOUCHY_DIR)
 endif
 
+ifneq "$(BINDIST)" "YES"
+BUILD_DIRS += \
+   utils/mkUserGuidePart
+endif
+
 BUILD_DIRS += utils/count_lines
 BUILD_DIRS += utils/compare_sizes
 
@@ -599,6 +621,7 @@ utils/ghctags_dist_DISABLE = YES
 utils/hpc_dist_DISABLE = YES
 utils/hsc2hs_dist-install_DISABLE = YES
 utils/ghc-pkg_dist-install_DISABLE = YES
+utils/mkUserGuidePart_dist_DISABLE = YES
 utils/compare_sizes_dist_DISABLE = YES
 compiler_stage2_DISABLE = YES
 compiler_stage3_DISABLE = YES
@@ -647,18 +670,6 @@ GhcBootLibHcOpts += -fno-warn-deprecated-flags
 # Add $(GhcLibHcOpts) to all library builds
 $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts)))
 
-# XXX Hack; remove this
-# Use -Wwarn for dph
-$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn))
-
-# XXX Hack; remove this
-# Use -Wwarn for 'binary' becuase it has redundant UNPACK pragmas
-libraries/binary_dist-install_HC_OPTS += -Wwarn
-libraries/binary_dist-boot_HC_OPTS += -Wwarn
-
-# XXX hack: haskeline has warnings about deprecated use of block/unblock
-libraries/haskeline_dist-install_HC_OPTS += -Wwarn
-
 # ----------------------------------------------
 # A useful pseudo-target
 .PHONY: stage1_libs
@@ -911,18 +922,23 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 	$(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)"
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update libffi/package.conf.install
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
-	$(foreach p, $(ALL_INSTALLED_PACKAGES),\
-	    "$(GHC_CABAL_INPLACE)" install \
-		 "$(INSTALLED_GHC_REAL)" \
-		 "$(INSTALLED_GHC_PKG_REAL)" \
-		 "$(STRIP_CMD)" \
-		 "$(DESTDIR)$(topdir)" \
-		 $p $(INSTALL_DISTDIR_$p) \
-		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
-		 $(RelocatableBuild) &&) true
-	$(foreach p, $(HIDDEN_PACKAGES),\
-	    "$(INSTALLED_GHC_PKG_REAL)" --global-conf "$(INSTALLED_PACKAGE_CONF)" \
-	                              hide $p &&) true
+	$(foreach p, $(ALL_INSTALLED_PACKAGES),                       \
+	    $(call make-command,                                      \
+	           "$(GHC_CABAL_INPLACE)" install                     \
+	                                  "$(INSTALLED_GHC_REAL)"     \
+	                                  "$(INSTALLED_GHC_PKG_REAL)" \
+	                                  "$(STRIP_CMD)"              \
+	                                  "$(DESTDIR)$(topdir)"       \
+	                                  $p $(INSTALL_DISTDIR_$p)    \
+	                                  '$(DESTDIR)'                \
+	                                  '$(prefix)'                 \
+	                                  '$(ghclibdir)'              \
+	                                  '$(docdir)/html/libraries'  \
+	                                  $(RelocatableBuild)))
+	$(foreach p, $(HIDDEN_PACKAGES),                                   \
+	    $(call make-command,                                           \
+	           "$(INSTALLED_GHC_PKG_REAL)"                             \
+	               --global-conf "$(INSTALLED_PACKAGE_CONF)" hide $p))
 
 # -----------------------------------------------------------------------------
 # Binary distributions