Skip to content
Snippets Groups Projects
Commit a96eb1c8 authored by Edward Z. Yang's avatar Edward Z. Yang Committed by Herbert Valerio Riedel
Browse files

Use directory-style database for bootstrapping database


This allows GHC HEAD to be bootstrapped using 7.10.

Addresses #9652

Signed-off-by: default avatarEdward Z. Yang <ezyang@cs.stanford.edu>

(cherry picked from commit 0899caab)
parent 3afe35d1
No related branches found
No related tags found
No related merge requests found
...@@ -726,7 +726,7 @@ ifneq "$(BINDIST)" "YES" ...@@ -726,7 +726,7 @@ ifneq "$(BINDIST)" "YES"
ifneq "$(BOOTSTRAPPING_CONF)" "" ifneq "$(BOOTSTRAPPING_CONF)" ""
ifeq "$(wildcard $(BOOTSTRAPPING_CONF))" "" ifeq "$(wildcard $(BOOTSTRAPPING_CONF))" ""
$(shell echo "[]" >$(BOOTSTRAPPING_CONF)) $(shell $(GHC_PKG) init $(BOOTSTRAPPING_CONF))
endif endif
endif endif
...@@ -1233,7 +1233,6 @@ sdist_%: ...@@ -1233,7 +1233,6 @@ sdist_%:
.PHONY: clean .PHONY: clean
CLEAN_FILES += libraries/bootstrapping.conf
CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h
CLEAN_FILES += libraries/integer-gmp/include/HsIntegerGmp.h CLEAN_FILES += libraries/integer-gmp/include/HsIntegerGmp.h
CLEAN_FILES += libraries/integer-gmp2/include/HsIntegerGmp.h CLEAN_FILES += libraries/integer-gmp2/include/HsIntegerGmp.h
...@@ -1262,6 +1261,7 @@ clean_files : ...@@ -1262,6 +1261,7 @@ clean_files :
$(call removeTrees,includes/dist-derivedconstants) $(call removeTrees,includes/dist-derivedconstants)
$(call removeTrees,inplace/bin) $(call removeTrees,inplace/bin)
$(call removeTrees,inplace/lib) $(call removeTrees,inplace/lib)
$(call removeTrees,libraries/bootstrapping.conf)
.PHONY: clean_libraries .PHONY: clean_libraries
clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES_STAGE1) $(PACKAGES_STAGE2)) clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES_STAGE1) $(PACKAGES_STAGE2))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment