Commit 6f573eb5 authored by Ian Lynagh's avatar Ian Lynagh

Call the final build system phase "final" rather than ""

parent c21f0768
...@@ -69,7 +69,7 @@ ifneq "$(OMIT_PHASE_1)" "YES" ...@@ -69,7 +69,7 @@ ifneq "$(OMIT_PHASE_1)" "YES"
$(MAKE) -r --no-print-directory -f ghc.mk phase=1 phase_1_builds $(MAKE) -r --no-print-directory -f ghc.mk phase=1 phase_1_builds
endif endif
@echo "===--- building final phase" @echo "===--- building final phase"
$(MAKE) -r --no-print-directory -f ghc.mk $@ $(MAKE) -r --no-print-directory -f ghc.mk phase=final $@
binary-dist: binary-dist-prep binary-dist: binary-dist-prep
ifeq "$(mingw32_TARGET_OS)" "1" ifeq "$(mingw32_TARGET_OS)" "1"
......
...@@ -39,7 +39,7 @@ docs/man/flags.xml: docs/users_guide/flags.xml ...@@ -39,7 +39,7 @@ docs/man/flags.xml: docs/users_guide/flags.xml
sed 1d $< >> $@ sed 1d $< >> $@
ifeq "$(BUILD_MAN)" "YES" ifeq "$(BUILD_MAN)" "YES"
ifeq "$(phase)" "" ifeq "$(phase)" "final"
$(eval $(call all-target,docs/man,$(MAN_PATH))) $(eval $(call all-target,docs/man,$(MAN_PATH)))
endif endif
......
...@@ -136,6 +136,10 @@ $(error $$(GhcLibWays) is empty, it must contain at least one way) ...@@ -136,6 +136,10 @@ $(error $$(GhcLibWays) is empty, it must contain at least one way)
endif endif
endif endif
ifeq "$(phase)" ""
phase = final
endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Utility definitions # Utility definitions
...@@ -507,7 +511,7 @@ endif ...@@ -507,7 +511,7 @@ endif
# ---------------------------------------------- # ----------------------------------------------
# Checking packages with 'cabal check' # Checking packages with 'cabal check'
ifeq "$(phase)" "" ifeq "$(phase)" "final"
ifeq "$(CHECK_PACKAGES)" "YES" ifeq "$(CHECK_PACKAGES)" "YES"
all: check_packages all: check_packages
endif endif
...@@ -644,7 +648,7 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO)) ...@@ -644,7 +648,7 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO))
ifeq "$(HADDOCK_DOCS)" "YES" ifeq "$(HADDOCK_DOCS)" "YES"
libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES) libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES)
cd libraries && sh gen_contents_index --inplace cd libraries && sh gen_contents_index --inplace
ifeq "$(phase)" "" ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/index.html)) $(eval $(call all-target,library_doc_index,libraries/index.html))
endif endif
INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js
......
...@@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3) ...@@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3)
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
ifeq "$3" "0" ifeq "$3" "0"
include $1/$2/package-data.mk include $1/$2/package-data.mk
else ifeq "$(phase)" "" else ifeq "$(phase)" "final"
include $1/$2/package-data.mk include $1/$2/package-data.mk
endif endif
endif endif
...@@ -109,7 +109,7 @@ ifneq "$(phase)" "0" ...@@ -109,7 +109,7 @@ ifneq "$(phase)" "0"
# bootstrapping stuff # bootstrapping stuff
ifeq "$3" "0" ifeq "$3" "0"
$(call include-dependencies,$1,$2,$3) $(call include-dependencies,$1,$2,$3)
else ifeq "$(phase)" "" else ifeq "$(phase)" "final"
# In the final phase, we also include the dependency files for # In the final phase, we also include the dependency files for
# everything else # everything else
$(call include-dependencies,$1,$2,$3) $(call include-dependencies,$1,$2,$3)
......
...@@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3) ...@@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3)
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
ifeq "$3" "0" ifeq "$3" "0"
include $1/$2/package-data.mk include $1/$2/package-data.mk
else ifeq "$(phase)" "" else ifeq "$(phase)" "final"
include $1/$2/package-data.mk include $1/$2/package-data.mk
endif endif
endif endif
...@@ -197,7 +197,7 @@ ifneq "$(phase)" "0" ...@@ -197,7 +197,7 @@ ifneq "$(phase)" "0"
# bootstrapping stuff # bootstrapping stuff
ifeq "$3" "0" ifeq "$3" "0"
$(call include-dependencies,$1,$2,$3) $(call include-dependencies,$1,$2,$3)
else ifeq "$(phase)" "" else ifeq "$(phase)" "final"
# In the final phase, we also include the dependency files for # In the final phase, we also include the dependency files for
# everything else # everything else
$(call include-dependencies,$1,$2,$3) $(call include-dependencies,$1,$2,$3)
......
...@@ -26,7 +26,7 @@ $(call all-target,$1,) ...@@ -26,7 +26,7 @@ $(call all-target,$1,)
.PHONY: html_$1 .PHONY: html_$1
ifeq "$$(phase)" "" ifeq "$$(phase)" "final"
ifeq "$$(BUILD_DOCBOOK_HTML)" "YES" ifeq "$$(BUILD_DOCBOOK_HTML)" "YES"
$(call all-target,$1,html_$1) $(call all-target,$1,html_$1)
INSTALL_HTML_DOC_DIRS += $1/$2 INSTALL_HTML_DOC_DIRS += $1/$2
...@@ -50,7 +50,7 @@ endif ...@@ -50,7 +50,7 @@ endif
.PHONY: ps_$1 .PHONY: ps_$1
ifeq "$$(phase)" "" ifeq "$$(phase)" "final"
ifeq "$$(BUILD_DOCBOOK_PS)" "YES" ifeq "$$(BUILD_DOCBOOK_PS)" "YES"
$(call all-target,$1,ps_$1) $(call all-target,$1,ps_$1)
INSTALL_DOCS += $1/$2.ps INSTALL_DOCS += $1/$2.ps
...@@ -65,7 +65,7 @@ $1/$2.ps: $$($1_DOCBOOK_SOURCES) ...@@ -65,7 +65,7 @@ $1/$2.ps: $$($1_DOCBOOK_SOURCES)
[ -f $$@ ] [ -f $$@ ]
endif endif
ifeq "$$(phase)" "" ifeq "$$(phase)" "final"
ifeq "$$(BUILD_DOCBOOK_PDF)" "YES" ifeq "$$(BUILD_DOCBOOK_PDF)" "YES"
$(call all-target,$1,pdf_$1) $(call all-target,$1,pdf_$1)
INSTALL_DOCS += $1/$2.pdf INSTALL_DOCS += $1/$2.pdf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment