diff options
| -rw-r--r-- | ghc.mk | 14 | ||||
| -rw-r--r-- | mk/build.mk.sample | 4 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rwxr-xr-x | validate | 5 |
4 files changed, 17 insertions, 8 deletions
@@ -435,16 +435,14 @@ define addExtraPackage ifeq "$2" "-" # Do nothing; this package is already handled above else ifeq "$2" "dph" -## DPH-specific clause -ifeq "$$(GhcProfiled)" "YES" -# Ignore package: The DPH packages need TH, which is incompatible with -# a profiled GHC -else ifneq "$$(BUILD_DPH)" "YES" -# Ignore package: DPH was disabled -else +ifeq "$$(BUILD_DPH) $$(GhcProfiled)" "YES NO" +# The DPH packages need TH, which is incompatible with a profiled GHC. +PACKAGES_STAGE2 += $1 +endif +else ifeq "$2" "extra" +ifeq "$$(BUILD_EXTRA_PKGS)" "YES" PACKAGES_STAGE2 += $1 endif -## end of DPH-specific clause else PACKAGES_STAGE2 += $1 endif diff --git a/mk/build.mk.sample b/mk/build.mk.sample index 3f9770226b..19a59ae5c9 100644 --- a/mk/build.mk.sample +++ b/mk/build.mk.sample @@ -69,6 +69,10 @@ V = 1 # working on stage 2 and want to freeze stage 1 and the libraries for # a while. +# Build the "extra" packages (see ./packages). This enables more tests. See: +# https://ghc.haskell.org/trac/ghc/wiki/Building/RunningTests/Running#AdditionalPackages +#BUILD_EXTRA_PKGS=YES + # Uncomment the following line to enable building DPH #BUILD_DPH=YES diff --git a/mk/config.mk.in b/mk/config.mk.in index bcdebbf113..175aa06bf2 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -773,6 +773,8 @@ endif # Build DPH? BUILD_DPH = NO +# Build the "extra" packages (see ./packages)? +BUILD_EXTRA_PKGS = NO ################################################################################ # @@ -171,6 +171,11 @@ echo "ValidateSpeed=$speed" >> mk/are-validating.mk echo "ValidateHpc=$hpc" >> mk/are-validating.mk echo "V=0" >> mk/are-validating.mk # Less gunk +if [ $speed != "FAST" ]; then + # Build the "extra" packages (see ./packages), to enable more tests. + echo "BUILD_EXTRA_PKGS=YES" >> mk/are-validating.mk +fi + if [ $use_dph -eq 1 ]; then echo "BUILD_DPH=YES" >> mk/are-validating.mk else |