summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2015-06-02 09:31:52 -0500
committerAustin Seipp <austin@well-typed.com>2015-06-02 09:31:52 -0500
commite796026b45974d71233eef7ffb6feee482c6dd7e (patch)
tree66b37c35a6238a3b1c64f8024509340608d4f52c
parent091944e3aec736b440a9c1204f152004e382c967 (diff)
downloadhaskell-e796026b45974d71233eef7ffb6feee482c6dd7e.tar.gz
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@well-typed.com> Test Plan: Crossed my fingers. Reviewers: nomeata, thomie Reviewed By: thomie Subscribers: bgamari, thomie Differential Revision: https://phabricator.haskell.org/D933
-rw-r--r--ghc.mk2
-rw-r--r--rules/haddock.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index 5a1845c2b8..3b38372353 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 a43df95066..5604a502d9 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) \