From 3bc03ff9b052015fbabec8f9727fd031a598a8ad Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Wed, 20 May 2009 12:22:41 +0000
Subject: [PATCH] Fix building ghc-pkg when bootstrapping

---
 utils/ghc-pkg/ghc.mk |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index b2d61ab..ff1b6e0 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -15,6 +15,21 @@
 
 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) $@
+	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)
@@ -28,6 +43,8 @@ else
 	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
@@ -67,6 +84,10 @@ 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"
-- 
1.7.10.4