[commit: ghc] wip/T8558: Build xhtml and haddock only when `HADDOCK_DOCS=YES` (aa1c1b2)

git at git.haskell.org git at git.haskell.org
Tue Nov 18 09:44:18 UTC 2014


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

On branch  : wip/T8558
Link       : http://ghc.haskell.org/trac/ghc/changeset/aa1c1b2a364e443ceb11b898cf3e648c14954fd9/ghc

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

commit aa1c1b2a364e443ceb11b898cf3e648c14954fd9
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 18 10:44:23 2014 +0100

    Build xhtml and haddock only when `HADDOCK_DOCS=YES`
    
    This fixes #8558


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

aa1c1b2a364e443ceb11b898cf3e648c14954fd9
 ghc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ghc.mk b/ghc.mk
index 587152d..1e8ea58 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -425,7 +425,10 @@ PACKAGES_STAGE2 += haskell98
 PACKAGES_STAGE2 += haskell2010
 endif
 
+ifeq "$(HADDOCK_DOCS)" "YES"
 PACKAGES_STAGE1 += xhtml
+endif
+
 ifeq "$(Windows_Target)" "NO"
 ifneq "$(TargetOS_CPP)" "ios"
 PACKAGES_STAGE1 += terminfo
@@ -665,8 +668,11 @@ else ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
 BUILD_DIRS += libraries/integer-gmp2/gmp
 endif
 
+ifeq "$(HADDOCK_DOCS)" "YES"
 BUILD_DIRS += utils/haddock
 BUILD_DIRS += utils/haddock/doc
+endif
+
 BUILD_DIRS += compiler
 BUILD_DIRS += utils/hsc2hs
 BUILD_DIRS += utils/ghc-pkg



More information about the ghc-commits mailing list