Use "order only constraints" for directories

[ghc-hetmet.git] / utils / ghc-pkg / ghc.mk

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index b2d61ab..d5ee062 100644 (file)
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -15,26 +15,42 @@
 
 utils/ghc-pkg_dist_PROG = ghc-pkg
 
-$(GHC_PKG_INPLACE) : utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext) $(MKDIRHIER)
-       $(MKDIRHIER) $(dir $(INPLACE_PACKAGE_CONF))
-       echo "[]" > $(INPLACE_PACKAGE_CONF)
+ifeq "$(BootingFromHc)" "YES"
+
+inplace/bin/ghc-pkg : utils/ghc-pkg/dist-install/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext)
 ifeq "$(Windows)" "YES"
        cp $< $@
 else
-       $(RM) $@
+       "$(RM)" $(RM_OPTS) $@
        echo "#!/bin/sh" >>$@
        echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@
        echo '$(TOP)/$< --global-conf $$PKGCONF $${1+"$$@"}' >> $@
        chmod +x $@
 endif
 
+else
+
+$(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_OPTS) $@
+       echo "#!/bin/sh" >>$@
+       echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@
+       echo '$(TOP)/$< --global-conf $$PKGCONF $${1+"$$@"}' >> $@
+       chmod +x $@
+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 \
+# 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 \
@@ -42,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)\""      >> $@
@@ -61,12 +80,19 @@ $(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)
 utils/ghc-pkg_dist-install_INSTALL_INPLACE = NO
 
+ifeq "$(BootingFromHc)" "YES"
+utils/ghc-pkg_dist-install_OTHER_OBJS += $(ALL_STAGE1_LIBS) $(ALL_STAGE1_LIBS) $(ALL_STAGE1_LIBS) $(ALL_RTS_LIBS) $(libffi_STATIC_LIB)
+endif
+
 $(eval $(call build-prog,utils/ghc-pkg,dist-install,1))
 
 ifeq "$(Windows)" "NO"
@@ -74,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
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+       "$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghc-pkg
        $(LN_S) ghc-pkg-$(ProjectVersion) $(DESTDIR)$(bindir)/ghc-pkg
 endif