diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-03 13:35:41 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-03 14:20:26 +0000 |
| commit | 056997a285a368f5f78905b4b325a3258484f71d (patch) | |
| tree | 8c0cd58381f7f7aac7d17061dd6157aaeb359daa /rules | |
| parent | 638ba3e8b74816934b29738b1dfaecb536dbcddd (diff) | |
| download | haskell-056997a285a368f5f78905b4b325a3258484f71d.tar.gz | |
Add PACKAGES_STAGE0 to build-dirs too; fixes #7700
This is sometimes needed when cross-compiling, as some packages may be
built in stage 0 but not stage 1.
In order to make everything work out, this also removes the requirement
that the build-dirs are in dependency order
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/haddock.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rules/haddock.mk b/rules/haddock.mk index 99a93f125d..4ef0fb1c6e 100644 --- a/rules/haddock.mk +++ b/rules/haddock.mk @@ -40,7 +40,10 @@ $1_$2_HADDOCK_FLAGS += --source-module=src/%{MODULE/./-}.html --source-entity=sr endif ifneq "$$(BINDIST)" "YES" -$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/. +# We need the quadruple dollars for the dependencies, as it isn't +# guaranteed that we are processing the packages in dependency order, +# so we don't want to expand it yet. +$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/. ifeq "$$(HSCOLOUR_SRCS)" "YES" "$$(GHC_CABAL_INPLACE)" hscolour $2 $1 endif |