diff options
author | Ian Lynagh <igloo@earth.li> | 2011-01-15 23:19:27 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2011-01-15 23:19:27 +0000 |
commit | a3be88fd60cc63b97ec8509f46a8d93025760792 (patch) | |
tree | eb73ab10e25592144b88a4dc80edd99adc18ea40 /rules/build-package.mk | |
parent | 18fe16c9d3468c818d4fd650f47cfd6971e578b5 (diff) | |
download | haskell-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 'rules/build-package.mk')
-rw-r--r-- | rules/build-package.mk | 75 |
1 files changed, 44 insertions, 31 deletions
diff --git a/rules/build-package.mk b/rules/build-package.mk index 7ce11feeb5..9e2bae3628 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -60,58 +60,71 @@ define build-package-helper # $2 = distdir # $3 = GHC stage to use (0 == bootstrapping compiler) -# We don't install things compiled by stage 0, so no need to put them -# in the bindist. -ifneq "$$(BINDIST) $3" "YES 0" +# --- CONFIGURATION -$(call all-target,$1,all_$1_$2) -# This give us things like -# all_libraries: all_libraries/base_dist-install -ifneq "$$($1_$2_GROUP)" "" -all_$$($1_$2_GROUP): all_$1_$2 -endif +$(call package-config,$1,$2,$3) -ifneq "$$(CHECKED_$1)" "YES" -CHECKED_$1 = YES -check_packages: check_$1 -.PHONY: check_$1 -check_$1: $$(GHC_CABAL_INPLACE) - $$(GHC_CABAL_INPLACE) check $1 +######################################## +ifeq "$$($1_$2_CONFIGURE_PHASE)" "" +$$(error No configure phase for $1_$2) +else ifeq "$$($1_$2_CONFIGURE_PHASE)" "$$(phase)" + +ifeq "$$(DEBUG)" "YES" +$$(warning $1/$2 configure phase) endif -# --- CONFIGURATION +ifneq "$$(BINDIST)" "YES" +$(call build-package-data,$1,$2,$3) +endif ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" include $1/$2/package-data.mk endif -$(call package-config,$1,$2,$3) - -ifeq "$$($1_$2_DISABLE)" "YES" +else ifeq "$$(phase_$$($1_$2_CONFIGURE_PHASE)_or_later)" "YES" ifeq "$$(DEBUG)" "YES" -$$(warning $1/$2 disabled) +$$(warning $1/$2 build phase) +endif + +ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" +include $1/$2/package-data.mk +ifeq "$$($1_$2_VERSION)" "" +$$(error No version for $1_$2 found) +endif endif -# A package is disabled when we want to bring its package-data.mk file -# up-to-date first, or due to other build dependencies. +$(call all-target,$1,all_$1_$2) -$(call all-target,$1_$2,$1/$2/package-data.mk) +else -ifneq "$$(BINDIST)" "YES" -# We have a rule for package-data.mk only when the package is -# disabled, because we want the build to fail if we haven't run phase 0. -$(call build-package-data,$1,$2,$3) +ifeq "$$(DEBUG)" "YES" +$$(warning $1/$2 disabled phase) endif -else +endif +######################################## -ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" -ifeq "$$($1_$2_VERSION)" "" -$$(error phase ordering error: $1/$2 is enabled, but $1/$2/package-data.mk does not exist) +# We don't install things compiled by stage 0, so no need to put them +# in the bindist. +ifneq "$$(BINDIST) $3" "YES 0" + +# This give us things like +# all_libraries: all_libraries/base_dist-install +ifneq "$$($1_$2_GROUP)" "" +all_$$($1_$2_GROUP): all_$1_$2 endif + +ifneq "$$(CHECKED_$1)" "YES" +CHECKED_$1 = YES +check_packages: check_$1 +.PHONY: check_$1 +check_$1: $$(GHC_CABAL_INPLACE) + $$(GHC_CABAL_INPLACE) check $1 endif +ifeq "$$(phase_$$($1_$2_CONFIGURE_PHASE)_done)" "YES" + # Sometimes we need to modify the automatically-generated package-data.mk # bindings in a special way for the GHC build system, so allow that here: $($1_PACKAGE_MAGIC) |