X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=faa946d8b8d4179ad41e605821e63b991939fe20;hb=e0e24363aa009ed49490bf90fc7871159caa9b2b;hp=b58777db51cccd3db0c9d62ca4179a8bedd77f0b;hpb=efe7a8d4719fb2e6f53126d834dff2b6831ad662;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index b58777d..faa946d 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -158,14 +158,10 @@ DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
 subdirs:
 	@echo $(SUBDIRS)
 
-.PHONY: boot
-
-boot: ifBuildable/ifBuildable cabal-bin ghc-prim/Setup
-
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
-CABAL=$(HERE_ABS)/cabal-bin
+CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf
 
 CABAL_GHC_FLAGS = -Wall
 ifeq "$(ghc_ge_605)" "NO"
@@ -174,16 +170,24 @@ endif
 
 BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath
 
-# We use -main-is so that GHC doesn't get confused and think
-# Main.hi/Main.o from cabal belongs to ghc-prim/Setup, or vice-versa.
-cabal-bin: cabal-bin.hs
-	$(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin -main-is Cabal
+.PHONY: boot
+
+boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf
 
-# ghc-prim/Setup doesn't really depend on cabal-bin, but pretending that it
-# does sequentialises building the two of them, which is nice given
-# they're sharing -odir and -hidir.
-ghc-prim/Setup: ghc-prim/Setup.hs cabal-bin
-	cd ghc-prim && $(GHC) $(BOOTSTRAPPING_FLAGS) --make Setup -o Setup
+cabal-bin: cabal-bin.hs
+	$(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin
+
+bootstrapping.conf: cabal-bin
+	echo "[]" > $@.tmp
+	-cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
+	cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$@.tmp
+	cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
+	cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+	-cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
+	cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$@.tmp
+	cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
+	cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+	mv $@.tmp $@
 
 installPackage/installPackage: installPackage.hs
 	-$(RM) -rf installPackage
@@ -349,6 +353,8 @@ distclean: clean
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	$(RM) -rf bootstrapping/*
+	$(RM) -f bootstrapping.conf     bootstrapping.conf.old
+	$(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old
 	$(RM) -f cabal-bin
 	$(RM) -rf ifBuildable
 	$(RM) -rf installPackage
@@ -362,6 +368,7 @@ $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
 clean.library.%:
 	$(RM) -f stamp/configure.library.*.$* $*/unbuildable
 	-cd $* && $(CABAL) clean
+	-cd $* && $(CABAL) clean --distpref=dist-bootstrapping
 	$(RM) -f $*/Setup $*/Setup.exe $*/Setup.hi $*/Setup.o
 	$(RM) $*/GNUmakefile $*/Makefile.local
 endif