[commit: ghc] ghc-7.10: Use directory-style database for bootstrapping database (a96eb1c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/a96eb1c80a772ea11e2d1def129e5766e7bb7c98/ghc

>---------------------------------------------------------------

commit a96eb1c80a772ea11e2d1def129e5766e7bb7c98
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sat Dec 27 10:57:30 2014 -0500

    Use directory-style database for bootstrapping database
    
    This allows GHC HEAD to be bootstrapped using 7.10.
    
    Addresses #9652
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    (cherry picked from commit 0899caab400e7a095528ea769a7e93a33717ae72)


>---------------------------------------------------------------

a96eb1c80a772ea11e2d1def129e5766e7bb7c98
 ghc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 6c587bd..0322ba6 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -726,7 +726,7 @@ ifneq "$(BINDIST)" "YES"
 
 ifneq "$(BOOTSTRAPPING_CONF)" ""
 ifeq "$(wildcard $(BOOTSTRAPPING_CONF))" ""
-$(shell echo "[]" >$(BOOTSTRAPPING_CONF))
+$(shell $(GHC_PKG) init $(BOOTSTRAPPING_CONF))
 endif
 endif
 
@@ -1233,7 +1233,6 @@ sdist_%:
 
 .PHONY: clean
 
-CLEAN_FILES += libraries/bootstrapping.conf
 CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h
 CLEAN_FILES += libraries/integer-gmp/include/HsIntegerGmp.h
 CLEAN_FILES += libraries/integer-gmp2/include/HsIntegerGmp.h
@@ -1262,6 +1261,7 @@ clean_files :
 	$(call removeTrees,includes/dist-derivedconstants)
 	$(call removeTrees,inplace/bin)
 	$(call removeTrees,inplace/lib)
+	$(call removeTrees,libraries/bootstrapping.conf)
 
 .PHONY: clean_libraries
 clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES_STAGE1) $(PACKAGES_STAGE2))