diff options
| author | simonpj@microsoft.com <unknown> | 2009-05-29 08:45:14 +0000 |
|---|---|---|
| committer | simonpj@microsoft.com <unknown> | 2009-05-29 08:45:14 +0000 |
| commit | dc249f10a67581f78cc30eabdfd241cd1f771232 (patch) | |
| tree | 85cf963b02e5712a52d27f47ca8f041753fd2903 | |
| parent | 0abcc75505992b925ca1b6fed6c97cb105b6fe96 (diff) | |
| download | haskell-dc249f10a67581f78cc30eabdfd241cd1f771232.tar.gz | |
Make haddocking depend on the library .a file
You can't Haddock a library until it's built. Previously that happened
automatically because
Haddock itself was built with stage2
And all the libraries were built with stage1
But now DPH is built with stage2, so Haddock can get to work too
early.
This patch adds the missing dependency (thanks to Simon M)
| -rw-r--r-- | rules/haddock.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/haddock.mk b/rules/haddock.mk index c87aa61b62..371d5e14df 100644 --- a/rules/haddock.mk +++ b/rules/haddock.mk @@ -37,6 +37,10 @@ $$($$($1_PACKAGE)_HADDOCK_FILE) : $$(MKDIRHIER) $$(INPLACE_BIN)/haddock$$(exeext $$(MKDIRHIER) $$(dir $$@) $$(GHC_CABAL_INPLACE) haddock $2 $1 --with-haddock=$$(TOP)/$$(INPLACE_BIN)/haddock --with-ghc=$$(TOP)/$$(INPLACE_BIN)/ghc-stage2 $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS) +# Make the haddocking depend on the library .a file, to ensure +# that we wait until the library is fully build before we haddock it +$$($$($1_PACKAGE)_HADDOCK_FILE) : $$($1_$2_v_LIB) + endif endef |