X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-pkg%2Fghc.mk;h=6bc9be57a4bc3bdb7377365651e30a4fefe88540;hb=6cec61d14a324285dbb8ce73d4c7215f1f8d6766;hp=ff1b6e0512152b739993e47526ed271fe8115d01;hpb=3bc03ff9b052015fbabec8f9727fd031a598a8ad;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index ff1b6e0..6bc9be5 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -13,7 +13,7 @@
 # -----------------------------------------------------------------------------
 # Bootstrapping ghc-pkg
 
-utils/ghc-pkg_dist_PROG = ghc-pkg
+utils/ghc-pkg_dist_PROG = ghc-pkg$(exeext)
 
 ifeq "$(BootingFromHc)" "YES"
 
@@ -21,7 +21,7 @@ inplace/bin/ghc-pkg : utils/ghc-pkg/dist-install/build/tmp/$(utils/ghc-pkg_dist_
 ifeq "$(Windows)" "YES"
 	cp $< $@
 else
-	$(RM) $@
+	"$(RM)" $(RM_OPTS) $@
 	echo "#!/bin/sh" >>$@
 	echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@
 	echo '$(TOP)/$< --global-conf $$PKGCONF $${1+"$$@"}' >> $@
@@ -30,13 +30,12 @@ endif
 
 else
 
-$(GHC_PKG_INPLACE) : utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext) $(MKDIRHIER)
-	$(MKDIRHIER) $(dir $(INPLACE_PACKAGE_CONF))
-	echo "[]" > $(INPLACE_PACKAGE_CONF)
+$(GHC_PKG_INPLACE) : utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext) | $$(dir $$@)/. $(INPLACE_PACKAGE_CONF)/.
+	"$(RM)" $(RM_OPTS) $(INPLACE_PACKAGE_CONF)/*
 ifeq "$(Windows)" "YES"
 	cp $< $@
 else
-	$(RM) $@
+	"$(RM)" $(RM_OPTS) $@
 	echo "#!/bin/sh" >>$@
 	echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@
 	echo '$(TOP)/$< --global-conf $$PKGCONF $${1+"$$@"}' >> $@
@@ -45,13 +44,16 @@ endif
 
 endif
 
-# depend on ghc-cabal, otherwise we build Cabal twice when building in parallel
-utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs $(GHC_CABAL_INPLACE) $(MKDIRHIER)
-	$(MKDIRHIER) bootstrapping
-	$(MKDIRHIER) utils/ghc-pkg/dist/build
-	$(GHC) --make utils/ghc-pkg/Main.hs -o $@ \
-	       -Wall \
+# depend on ghc-cabal, otherwise we build Cabal twice when building in parallel.
+# (ghc-cabal is an order-only dependency, we don't need to rebuild ghc-pkg
+# if ghc-cabal is newer).
+# The binary package is not warning-clean, so we need a few -fno-warns here.
+utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs | bootstrapping/. $$(dir $$@)/. $(GHC_CABAL_INPLACE) 
+	"$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
+	       -no-user-package-conf \
+	       -Wall -fno-warn-unused-imports \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
+	       -DBOOTSTRAPPING \
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
                -iutils/ghc-pkg \
@@ -59,10 +61,13 @@ utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main
 	       -ilibraries/Cabal \
 	       -ilibraries/filepath \
 	       -ilibraries/extensible-exceptions \
-	       -ilibraries/hpc
+	       -ilibraries/hpc \
+	       -ilibraries/binary/src \
+	       -ilibraries/bin-package-db
 
-utils/ghc-pkg/Version.hs: mk/config.mk
-	$(RM) -f $@
+
+utils/ghc-pkg/Version.hs: mk/project.mk
+	"$(RM)" $(RM_OPTS) $@
 	echo "module Version where"                    >> $@
 	echo "version, targetOS, targetARCH :: String" >> $@
 	echo "version    = \"$(ProjectVersion)\""      >> $@
@@ -76,9 +81,10 @@ $(eval $(call clean-target,utils/ghc-pkg,dist,\
 # -----------------------------------------------------------------------------
 # Building ghc-pkg with stage 1
 
+utils/ghc-pkg_dist-install_USES_CABAL = YES
+utils/ghc-pkg_PACKAGE = ghc-pkg
+
 utils/ghc-pkg_dist-install_PROG = ghc-pkg
-utils/ghc-pkg_dist-install_MODULES = Main Version
-utils/ghc-pkg_dist-install_DEPS = Cabal
 utils/ghc-pkg_dist-install_SHELL_WRAPPER = YES
 utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER = YES
 utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion)
@@ -95,8 +101,8 @@ install: install_utils/ghc-pkg_link
 
 .PNONY: install_utils/ghc-pkg_link
 install_utils/ghc-pkg_link: 
-	$(MKDIRHIER) $(DESTDIR)$(bindir)
-	$(RM) -f $(DESTDIR)$(bindir)/ghc-pkg
-	$(LN_S) ghc-pkg-$(ProjectVersion) $(DESTDIR)$(bindir)/ghc-pkg
+	$(call INSTALL_DIR,"$(DESTDIR)$(bindir)")
+	"$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/ghc-pkg"
+	$(LN_S) ghc-pkg-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghc-pkg"
 endif