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)

diff --git a/rules/haddock.mk b/rules/haddock.mk
index c87aa61..371d5e1 100644 (file)
--- 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