summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2014-12-27 10:57:30 -0500
committerEdward Z. Yang <ezyang@cs.stanford.edu>2014-12-27 10:57:43 -0500
commit0899caab400e7a095528ea769a7e93a33717ae72 (patch)
treecf154a0b0227ec408d2b7362e18543bade03a559
parentc0ab76744c6b3397ac56192b320ff63e5b029c54 (diff)
downloadhaskell-0899caab400e7a095528ea769a7e93a33717ae72.tar.gz
Use directory-style database for bootstrapping database
Summary: This allows GHC HEAD to be bootstrapped using 7.10. Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu> Test Plan: validate Reviewers: austin Subscribers: carter, thomie Differential Revision: https://phabricator.haskell.org/D589 GHC Trac Issues: #9652
-rw-r--r--ghc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc.mk b/ghc.mk
index 6c587bd58a..0322ba6b47 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))