summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-01-15 23:19:27 +0000
committerIan Lynagh <igloo@earth.li>2011-01-15 23:19:27 +0000
commita3be88fd60cc63b97ec8509f46a8d93025760792 (patch)
treeeb73ab10e25592144b88a4dc80edd99adc18ea40 /Makefile
parent18fe16c9d3468c818d4fd650f47cfd6971e578b5 (diff)
downloadhaskell-a3be88fd60cc63b97ec8509f46a8d93025760792.tar.gz
Build system improvements
We no longer use dummy-ghc; instead we don't configure most packages until the stage1 compiler is available. We also now use Cabal for building the ghc-bin package. There are a couple more sanity checks too.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 13 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 93ee7bc7d1..12cae7473e 100644
--- a/Makefile
+++ b/Makefile
@@ -60,21 +60,25 @@ REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framewor
# it does nothing if we specify a target that already exists.
.PHONY: $(REALGOALS)
$(REALGOALS) all: mk/config.mk.old mk/project.mk.old compiler/ghc.cabal.old
- @echo "===--- updating makefiles phase 0"
- $(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
+ @echo "===--- building phase 0"
+ $(MAKE) -r --no-print-directory -f ghc.mk phase=0 all
ifneq "$(OMIT_PHASE_1)" "YES"
- @echo "===--- updating makefiles phase 1"
- $(MAKE) -r --no-print-directory -f ghc.mk phase=1 just-makefiles
+ @echo "===--- building phase 1"
+ $(MAKE) -r --no-print-directory -f ghc.mk phase=1 all
endif
ifneq "$(OMIT_PHASE_2)" "YES"
- @echo "===--- updating makefiles phase 2"
- $(MAKE) -r --no-print-directory -f ghc.mk phase=2 just-makefiles
+ @echo "===--- building phase 2"
+ $(MAKE) -r --no-print-directory -f ghc.mk phase=2 all
endif
ifneq "$(OMIT_PHASE_3)" "YES"
- @echo "===--- updating makefiles phase 3"
- $(MAKE) -r --no-print-directory -f ghc.mk phase=3 just-makefiles
+ @echo "===--- building phase 3"
+ $(MAKE) -r --no-print-directory -f ghc.mk phase=3 all
endif
- @echo "===--- finished updating makefiles"
+ifneq "$(OMIT_PHASE_4)" "YES"
+ @echo "===--- building phase 4"
+ $(MAKE) -r --no-print-directory -f ghc.mk phase=4 all
+endif
+ @echo "===--- building final phase"
$(MAKE) -r --no-print-directory -f ghc.mk $@
binary-dist: binary-dist-prep