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

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index 388af0d..ae15376 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -1,26 +1,55 @@
 # -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
 # Bootstrapping ghc-pkg
 
 utils/ghc-pkg_dist_PROG = ghc-pkg
 
+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_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) $(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
-	$(RM) $@
+	"$(RM)" $(RM_OPTS) $@
 	echo "#!/bin/sh" >>$@
 	echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@
-	echo '$(TOP)/utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG) --global-conf $$PKGCONF $${1+"$$@"}' >> $@
+	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 $@ \
+	"$(MKDIRHIER)" bootstrapping
+	"$(MKDIRHIER)" utils/ghc-pkg/dist/build
+	"$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
 	       -Wall \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
 	       -odir  bootstrapping \
@@ -30,10 +59,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)\""      >> $@
@@ -49,12 +81,16 @@ $(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 terminfo bin-package-db
 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"
@@ -62,8 +98,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