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

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index ae15376..44b448d 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -30,8 +30,7 @@ endif
 
 else
 
-$(GHC_PKG_INPLACE) : utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext) $(MKDIRHIER)
-	"$(MKDIRHIER)" $(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 $< $@
@@ -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
+# 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 \
+	       -Wall -fno-warn-unused-imports \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
+	       -DBOOTSTRAPPING \
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
                -iutils/ghc-pkg \
@@ -61,7 +60,7 @@ utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main
 	       -ilibraries/extensible-exceptions \
 	       -ilibraries/hpc \
 	       -ilibraries/binary/src \
-	       -ilibraries/bin-package-db \
+	       -ilibraries/bin-package-db
 
 
 utils/ghc-pkg/Version.hs: mk/project.mk
@@ -81,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 terminfo bin-package-db
+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)
@@ -98,8 +100,8 @@ install: install_utils/ghc-pkg_link
 
 .PNONY: install_utils/ghc-pkg_link
 install_utils/ghc-pkg_link: 
-	$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	"$(RM)" $(RM_OPTS) $(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