X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-pkg%2Fghc.mk;h=679570315f0178a728ba93ac3c924f21d1118610;hb=3fd06a108c4944f3e270288da5e82480c93c5d27;hp=289c67c328c2bf60f69cc1721254c2776749843c;hpb=52ed0609e8583a607676527d737ea1ba754deb3c;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index 289c67c..6795703 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -31,8 +31,8 @@ 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)
+	"$(MKDIRHIER)" $(INPLACE_PACKAGE_CONF)
+	"$(RM)" $(RM_OPTS) $(INPLACE_PACKAGE_CONF)/*
 ifeq "$(Windows)" "YES"
 	cp $< $@
 else
@@ -46,12 +46,14 @@ endif
 endif
 
 # depend on ghc-cabal, otherwise we build Cabal twice when building in parallel
+# 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) $(MKDIRHIER)
 	"$(MKDIRHIER)" bootstrapping
 	"$(MKDIRHIER)" utils/ghc-pkg/dist/build
 	"$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
-	       -Wall \
+	       -Wall -fno-warn-unused-imports \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
+	       -DBOOTSTRAPPING \
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
                -iutils/ghc-pkg \
@@ -59,7 +61,10 @@ 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/project.mk
 	"$(RM)" $(RM_OPTS) $@
@@ -78,7 +83,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,7 +103,7 @@ install: install_utils/ghc-pkg_link
 
 .PNONY: install_utils/ghc-pkg_link
 install_utils/ghc-pkg_link: 
-	"$(MKDIRHIER)" $(DESTDIR)$(bindir)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	"$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghc-pkg
 	$(LN_S) ghc-pkg-$(ProjectVersion) $(DESTDIR)$(bindir)/ghc-pkg
 endif