X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-pkg%2Fghc.mk;h=1afd962112efffa46088bff82536c79aa216ead2;hb=e5bc09bc47d6d922501b51e9da8f84ef6a7ccbea;hp=b2d61ab06680ef9a232f4a0d5a0f7f32c4696927;hpb=7f69b695c1c6647c72c8c417ede2c8450f13550c;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index b2d61ab..1afd962 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,11 +43,13 @@ 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
 	$(MKDIRHIER) utils/ghc-pkg/dist/build
-	$(GHC) --make utils/ghc-pkg/Main.hs -o $@ \
+	$(GHC) $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
 	       -Wall \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
 	       -odir  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"