X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-pkg%2Fghc.mk;h=44b448d69ab08e0b46fb8f9a19ae902704ec02f5;hb=f4b727487a65e6b611bbaafbd2207bd63a8df706;hp=1afd962112efffa46088bff82536c79aa216ead2;hpb=e5bc09bc47d6d922501b51e9da8f84ef6a7ccbea;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index 1afd962..44b448d 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -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+"$$@"}' >> $@
@@ -46,12 +45,12 @@ 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) $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
-	       -Wall \
+# 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 $(GHC_CABAL_INPLACE) | bootstrapping/. $$(dir $$@)/.
+	"$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
+	       -Wall -fno-warn-unused-imports \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
+	       -DBOOTSTRAPPING \
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
                -iutils/ghc-pkg \
@@ -59,10 +58,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)\""      >> $@
@@ -78,7 +80,10 @@ $(eval $(call clean-target,utils/ghc-pkg,dist,\
 
 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_DEPS = Cabal bin-package-db
+ifeq "$(Windows)" "NO"
+utils/ghc-pkg_dist-install_DEPS += terminfo
+endif
 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 +100,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
+	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+	"$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/ghc-pkg"
+	$(LN_S) ghc-pkg-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghc-pkg"
 endif