diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | docs/man/ghc.mk | 2 | ||||
-rw-r--r-- | ghc.mk | 8 | ||||
-rw-r--r-- | rules/build-package.mk | 4 | ||||
-rw-r--r-- | rules/build-prog.mk | 4 | ||||
-rw-r--r-- | rules/docbook.mk | 6 |
6 files changed, 15 insertions, 11 deletions
@@ -69,7 +69,7 @@ ifneq "$(OMIT_PHASE_1)" "YES" $(MAKE) -r --no-print-directory -f ghc.mk phase=1 phase_1_builds endif @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 ifeq "$(mingw32_TARGET_OS)" "1" diff --git a/docs/man/ghc.mk b/docs/man/ghc.mk index 6775c55870..96fef2dbf6 100644 --- a/docs/man/ghc.mk +++ b/docs/man/ghc.mk @@ -39,7 +39,7 @@ docs/man/flags.xml: docs/users_guide/flags.xml sed 1d $< >> $@ ifeq "$(BUILD_MAN)" "YES" -ifeq "$(phase)" "" +ifeq "$(phase)" "final" $(eval $(call all-target,docs/man,$(MAN_PATH))) endif @@ -136,6 +136,10 @@ $(error $$(GhcLibWays) is empty, it must contain at least one way) endif endif +ifeq "$(phase)" "" +phase = final +endif + # ----------------------------------------------------------------------------- # Utility definitions @@ -507,7 +511,7 @@ endif # ---------------------------------------------- # Checking packages with 'cabal check' -ifeq "$(phase)" "" +ifeq "$(phase)" "final" ifeq "$(CHECK_PACKAGES)" "YES" all: check_packages endif @@ -644,7 +648,7 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO)) ifeq "$(HADDOCK_DOCS)" "YES" libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES) cd libraries && sh gen_contents_index --inplace -ifeq "$(phase)" "" +ifeq "$(phase)" "final" $(eval $(call all-target,library_doc_index,libraries/index.html)) endif INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js diff --git a/rules/build-package.mk b/rules/build-package.mk index 74ffbbd925..ac0a8eebce 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3) ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" ifeq "$3" "0" include $1/$2/package-data.mk -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" include $1/$2/package-data.mk endif endif @@ -109,7 +109,7 @@ ifneq "$(phase)" "0" # bootstrapping stuff ifeq "$3" "0" $(call include-dependencies,$1,$2,$3) -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" # In the final phase, we also include the dependency files for # everything else $(call include-dependencies,$1,$2,$3) diff --git a/rules/build-prog.mk b/rules/build-prog.mk index c08c40828a..5c352a2f95 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3) ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" ifeq "$3" "0" include $1/$2/package-data.mk -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" include $1/$2/package-data.mk endif endif @@ -197,7 +197,7 @@ ifneq "$(phase)" "0" # bootstrapping stuff ifeq "$3" "0" $(call include-dependencies,$1,$2,$3) -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" # In the final phase, we also include the dependency files for # everything else $(call include-dependencies,$1,$2,$3) diff --git a/rules/docbook.mk b/rules/docbook.mk index 8030fb7dc8..5a7bfdfd83 100644 --- a/rules/docbook.mk +++ b/rules/docbook.mk @@ -26,7 +26,7 @@ $(call all-target,$1,) .PHONY: html_$1 -ifeq "$$(phase)" "" +ifeq "$$(phase)" "final" ifeq "$$(BUILD_DOCBOOK_HTML)" "YES" $(call all-target,$1,html_$1) INSTALL_HTML_DOC_DIRS += $1/$2 @@ -50,7 +50,7 @@ endif .PHONY: ps_$1 -ifeq "$$(phase)" "" +ifeq "$$(phase)" "final" ifeq "$$(BUILD_DOCBOOK_PS)" "YES" $(call all-target,$1,ps_$1) INSTALL_DOCS += $1/$2.ps @@ -65,7 +65,7 @@ $1/$2.ps: $$($1_DOCBOOK_SOURCES) [ -f $$@ ] endif -ifeq "$$(phase)" "" +ifeq "$$(phase)" "final" ifeq "$$(BUILD_DOCBOOK_PDF)" "YES" $(call all-target,$1,pdf_$1) INSTALL_DOCS += $1/$2.pdf |