X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=336b2b0840adda96a810f3c8af09d801917347f8;hp=9e1026e00a6f40e7db533097b2c822159c8843ce;hb=facfbf28a9bd4edeebc23e6d74a77a7ea83e5c61;hpb=e51cdf9b6e54fb4052e46b6d7afb15e062928467

diff --git a/ghc.mk b/ghc.mk
index 9e1026e..336b2b0 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -367,24 +367,29 @@ endif
 
 # We cannot run ghc-cabal to configure a package until we have
 # configured and registered all of its dependencies.  So the following
-# hack forces all the configure steps to happen in exactly the order
-# given in the PACKAGES variable above.  Ideally we should use the
-# correct dependencies here to allow more parallelism, but we don't
-# know the dependencies until we've generated the pacakge-data.mk
-# files.
+# hack forces all the configure steps to happen in exactly the following order:
+#
+#  $(PACKAGES) ghc(stage2) $(PACKAGES_STAGE2)
+#
+# Ideally we should use the correct dependencies here to allow more
+# parallelism, but we don't know the dependencies until we've
+# generated the pacakge-data.mk files.
 define fixed_pkg_dep
-libraries/$1/$2/package-data.mk : $$(GHC_PKG_INPLACE) $$(if $$(fixed_pkg_prev),libraries/$$(fixed_pkg_prev)/$2/package-data.mk)
-fixed_pkg_prev:=$1
+libraries/$1/$2/package-data.mk : $$(GHC_PKG_INPLACE) $$(fixed_pkg_prev)
+fixed_pkg_prev:=libraries/$1/$2/package-data.mk
 endef
 
 ifneq "$(BINDIST)" "YES"
 fixed_pkg_prev=
-$(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval $(call fixed_pkg_dep,$(pkg),dist-install)))
+$(foreach pkg,$(PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-install)))
+
+# the GHC package doesn't live in libraries/, so we add its dependency manually:
+compiler/stage2/package-data.mk: $(fixed_pkg_prev)
+fixed_pkg_prev:=compiler/stage2/package-data.mk
+
+# and continue with PACKAGES_STAGE2, which depend on GHC:
+$(foreach pkg,$(PACKAGES_STAGE2),$(eval $(call fixed_pkg_dep,$(pkg),dist-install)))
 
-# We assume that the stage2 compiler depends on all the libraries, so
-# they all get added to the package database before we try to configure
-# it
-compiler/stage2/package-data.mk: $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),libraries/$(pkg)/dist-install/package-data.mk)
 ghc/stage1/package-data.mk: compiler/stage1/package-data.mk
 ghc/stage2/package-data.mk: compiler/stage2/package-data.mk
 # haddock depends on ghc and some libraries, but depending on GHC's
@@ -521,11 +526,12 @@ endif
 ifneq "$(CLEANING)" "YES"
 BUILD_DIRS += \
    $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2))
+endif
+
 ifneq "$(BootingFromHc)" "YES"
 BUILD_DIRS += \
    libraries/dph
 endif
-endif
 
 ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
 BUILD_DIRS += libraries/integer-gmp/gmp
@@ -816,6 +822,21 @@ endif
 INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
 HIDDEN_PACKAGES = binary
 
+define set_INSTALL_DISTDIR
+# $1 = libraries/base, $2 = dist-install
+# =>
+# INSTALL_DISTDIR_libraries/base = dist-install
+INSTALL_DISTDIR_$1 = $2
+endef
+
+$(eval $(foreach p,$(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\
+$(call set_INSTALL_DISTDIR,libraries/$p,dist-install)))
+INSTALL_DISTDIR_compiler = stage2
+
+ALL_INSTALLED_PACKAGES = $(addprefix libraries/,$(INSTALLED_PACKAGES)) \
+                         compiler \
+                         $(addprefix libraries/,$(PACKAGES_STAGE2))
+
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
 	$(INSTALL_DIR) $(DESTDIR)$(topdir)
@@ -823,24 +844,17 @@ 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, $(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\
+	$(foreach p, $(ALL_INSTALLED_PACKAGES),\
 	    "$(GHC_CABAL_INPLACE)" install \
 		 $(INSTALLED_GHC_REAL) \
 		 $(INSTALLED_GHC_PKG_REAL) \
 		 $(DESTDIR)$(topdir) \
-		 libraries/$p dist-install \
+		 $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
-	"$(GHC_CABAL_INPLACE)" install \
-		 $(INSTALLED_GHC_REAL) \
-	 	 $(INSTALLED_GHC_PKG_REAL) \
-		 $(DESTDIR)$(topdir) \
-		 compiler stage2 \
-		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
-		 $(RelocatableBuild)
 
 # -----------------------------------------------------------------------------
 # Binary distributions