[commit: ghc] master: build: make haddock a bit less chatty (e796026)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e796026b45974d71233eef7ffb6feee482c6dd7e/ghc

>---------------------------------------------------------------

commit e796026b45974d71233eef7ffb6feee482c6dd7e
Author: Austin Seipp <austin at well-typed.com>
Date:   Tue Jun 2 09:31:52 2015 -0500

    build: make haddock a bit less chatty
    
    Summary:
    Haddock outputs well over a thousand lines of file output just to give
    its executive summary about coverage. Kill this by default, since we
    really don't need it in any setting.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    
    Test Plan: Crossed my fingers.
    
    Reviewers: nomeata, thomie
    
    Reviewed By: thomie
    
    Subscribers: bgamari, thomie
    
    Differential Revision: https://phabricator.haskell.org/D933


>---------------------------------------------------------------

e796026b45974d71233eef7ffb6feee482c6dd7e
 ghc.mk           | 2 +-
 rules/haddock.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 5a1845c..3b38372 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1375,7 +1375,7 @@ validate_build_xhtml:
 	cd libraries/xhtml && ./Setup configure --with-ghc="$(BINDIST_PREFIX)/bin/ghc" $(BINDIST_HADDOCK_FLAG) $(BINDIST_LIBRARY_FLAGS) --global --builddir=dist-bindist --prefix="$(BINDIST_PREFIX)"
 	cd libraries/xhtml && ./Setup build   --builddir=dist-bindist
 ifeq "$(HADDOCK_DOCS)" "YES"
-	cd libraries/xhtml && ./Setup haddock --ghc-options=-optP-P --builddir=dist-bindist
+	cd libraries/xhtml && ./Setup haddock -v0 --ghc-options=-optP-P --builddir=dist-bindist
 endif
 	cd libraries/xhtml && ./Setup install --builddir=dist-bindist
 	cd libraries/xhtml && ./Setup clean   --builddir=dist-bindist
diff --git a/rules/haddock.mk b/rules/haddock.mk
index a43df95..5604a50 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -48,6 +48,7 @@ ifeq "$$(HSCOLOUR_SRCS)" "YES"
 	"$$(ghc-cabal_INPLACE)" hscolour $1 $2
 endif
 	"$$(TOP)/$$(INPLACE_BIN)/haddock" \
+	  --verbosity=0 \
 	  --odir="$1/$2/doc/html/$$($1_PACKAGE)" \
 	  --no-tmp-comp-dir \
 	  --dump-interface=$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) \