X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=94e9080909fe67b4e1d407fbecc28a7d019574c0;hb=f5b3f16c9321a1594ce1ed0b73914feabaa321a8;hp=336b2b0840adda96a810f3c8af09d801917347f8;hpb=45f9e9972d725b01a62e018a22b6b77c35ae850f;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 336b2b0..94e9080 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -525,7 +525,7 @@ endif
 
 ifneq "$(CLEANING)" "YES"
 BUILD_DIRS += \
-   $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2))
+   $(patsubst %, libraries/%, $(PACKAGES))
 endif
 
 ifneq "$(BootingFromHc)" "YES"
@@ -549,6 +549,12 @@ BUILD_DIRS += \
    $(GHC_TOUCHY_DIR)
 endif
 
+ifneq "$(CLEANING)" "YES"
+# After compiler/, because these packages depend on it
+BUILD_DIRS += \
+   $(patsubst %, libraries/%, $(PACKAGES_STAGE2))
+endif
+
 # XXX libraries/% must come before any programs built with stage1, see
 # Note [lib-depends].
 
@@ -685,6 +691,15 @@ libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binar
 
 $(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts)))
 
+# Make sure we have all the GHCi libs by the time we've built
+# ghc-stage2.  DPH includes a bit of Template Haskell which needs the
+# GHCI libs, and we don't have a better way to express that dependency.
+#
+GHCI_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_GHCI_LIB)) \
+	    $(compiler_stage2_GHCI_LIB)
+
+ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS)
+
 endif
 
 # -----------------------------------------------------------------------------
@@ -721,30 +736,30 @@ install: install_packages install_libs install_libexecs install_headers \
 		 install_topdirs install_topdir_scripts
 
 install_bins: $(INSTALL_BINS)
-	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
 	for i in $(INSTALL_BINS); do \
-		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir) ;  \
+		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ;  \
                 if test "$(darwin_TARGET_OS)" = "1"; then \
-                   sh mk/fix_install_names.sh $(ghclibdir) $(DESTDIR)$(bindir)/$$i ; \
+                   sh mk/fix_install_names.sh $(ghclibdir) "$(DESTDIR)$(bindir)/$$i" ; \
                 fi ; \
 	done
 
 install_libs: $(INSTALL_LIBS)
-	$(INSTALL_DIR) $(DESTDIR)$(ghclibdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)"
 	for i in $(INSTALL_LIBS); do \
 		case $$i in \
 		  *.a) \
-		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \
+		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \
 		    $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \
 		  *.dll) \
-		    $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \
+		    $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \
 		  *.so) \
-		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \
+		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \
 		  *.dylib) \
-		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \
-		    install_name_tool -id $(DESTDIR)$(ghclibdir)/`basename $$i` $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \
+		    $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \
+		    install_name_tool -id "$(DESTDIR)$(ghclibdir)/`basename $$i`" "$(DESTDIR)$(ghclibdir)/`basename $$i`" ;; \
 		  *) \
-		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \
+		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \
 		esac; \
 	done
 
@@ -752,9 +767,9 @@ install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
 ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
 	@:
 else
-	$(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)"
 	for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
-		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
+		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \
 	done
 endif
 
@@ -762,48 +777,51 @@ install_libexecs:  $(INSTALL_LIBEXECS)
 ifeq "$(INSTALL_LIBEXECS)" ""
 	@:
 else
-	$(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)"
 	for i in $(INSTALL_LIBEXECS); do \
-		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
+		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \
 	done
+# We rename ghc-stage2, so that the right program name is used in error
+# messages etc.
+	"$(MV)" "$(DESTDIR)$(ghclibexecdir)/ghc-stage2" "$(DESTDIR)$(ghclibexecdir)/ghc"
 endif
 
 install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS)
-	$(INSTALL_DIR) $(DESTDIR)$(topdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
 	for i in $(INSTALL_TOPDIR_SCRIPTS); do \
-		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(topdir); \
+		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(topdir)"; \
 	done
 
 install_topdirs: $(INSTALL_TOPDIRS)
-	$(INSTALL_DIR) $(DESTDIR)$(topdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
 	for i in $(INSTALL_TOPDIRS); do \
-		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(topdir); \
+		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \
 	done
 
 install_headers: $(INSTALL_HEADERS)
-	$(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)"
 	for i in $(INSTALL_HEADERS); do \
-		$(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghcheaderdir); \
+		$(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \
 	done
 
 install_docs: $(INSTALL_HEADERS)
-	$(INSTALL_DIR) $(DESTDIR)$(docdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
 ifneq "$(INSTALL_DOCS)" ""
 	for i in $(INSTALL_DOCS); do \
-		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \
+		$(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)"; \
 	done
 endif
-	$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html
-	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html
+	$(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html"
+	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
 ifneq "$(INSTALL_LIBRARY_DOCS)" ""
 	for i in $(INSTALL_LIBRARY_DOCS); do \
-		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \
+		$(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \
 	done
 endif
 ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
 	for i in $(INSTALL_HTML_DOC_DIRS); do \
-		$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \
-		$(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \
+		$(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
+		$(INSTALL_DOC) $(INSTALL_OPTS) $$i/* "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
 	done
 endif
 
@@ -812,7 +830,7 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
 # Install packages in the right order, so that ghc-pkg doesn't complain.
 # Also, install ghc-pkg first.
 ifeq "$(Windows)" "NO"
-INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-stage2
+INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg
 else
 INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
@@ -839,21 +857,21 @@ ALL_INSTALLED_PACKAGES = $(addprefix libraries/,$(INSTALLED_PACKAGES)) \
 
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
-	$(INSTALL_DIR) $(DESTDIR)$(topdir)
-	"$(RM)" -r $(RM_OPTS) $(INSTALLED_PACKAGE_CONF)
-	$(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
+	$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
+	"$(RM)" -r $(RM_OPTS) "$(INSTALLED_PACKAGE_CONF)"
+	$(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) \
-		 $(DESTDIR)$(topdir) \
+		 "$(INSTALLED_GHC_REAL)" \
+		 "$(INSTALLED_GHC_PKG_REAL)" \
+		 "$(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) \
+	    "$(INSTALLED_GHC_PKG_REAL)" --global-conf "$(INSTALLED_PACKAGE_CONF)" \
 	                              hide $p &&) true
 
 # -----------------------------------------------------------------------------