[commit: ghc] ghc-7.8: Temporarily fight off build bogons on OS X (7d2dbfc)

git at git.haskell.org git at git.haskell.org
Mon Mar 31 11:51:46 UTC 2014


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

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/7d2dbfc3ddfa756c855cc01d8f66b236e493f476/ghc

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

commit 7d2dbfc3ddfa756c855cc01d8f66b236e493f476
Author: Austin Seipp <austin at well-typed.com>
Date:   Mon Mar 31 06:47:44 2014 -0500

    Temporarily fight off build bogons on OS X
    
    Right now there's a bug with Clang that prevents 'cabal haddock' from
    working nicely. But there's an easy fix for now.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    (cherry picked from commit 52c6dc970272437aa83a936fc1fe63977fa6178d)


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

7d2dbfc3ddfa756c855cc01d8f66b236e493f476
 ghc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index f864443..eeb0d6a 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1350,7 +1350,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 --builddir=dist-bindist
+	cd libraries/xhtml && ./Setup haddock --ghc-options=-optP-P --builddir=dist-bindist
 endif
 	cd libraries/xhtml && ./Setup install --builddir=dist-bindist
 	cd libraries/xhtml && ./Setup clean   --builddir=dist-bindist



More information about the ghc-commits mailing list