From 8ca5375714268a61d2549b02204bb44745cb4cbf Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 30 Jul 2010 23:50:01 +0000 Subject: [PATCH] Always haddock by default Revert this patch: Matthias Kilian **20090920181319 Don't build haddock if HADDOC_DOCS = NO, and disable HADDOC_DOCS if GhcWithInterpreter = NO Haddock uses TcRnDriver.tcRnGetInfo, which is only available if GHCI is built. Set HADDOC_DOCS to NO if GhcWithInterpreter is NO, and disable the haddock build if HADDOC_DOCS = NO. --- ghc.mk | 2 -- mk/config.mk.in | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ghc.mk b/ghc.mk index 299fcb9..5a1864e 100644 --- a/ghc.mk +++ b/ghc.mk @@ -531,11 +531,9 @@ BUILD_DIRS += \ $(GHC_GENAPPLY_DIR) endif -ifneq "$(HADDOCK_DOCS)" "NO" BUILD_DIRS += \ utils/haddock \ utils/haddock/doc -endif ifneq "$(CLEANING)" "YES" BUILD_DIRS += \ diff --git a/mk/config.mk.in b/mk/config.mk.in index 2daf623..2fc03c7 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -725,7 +725,7 @@ SRC_ALEX_OPTS = -g HSTAGS = @HstagsCmd@ # Should we build haddock docs? -HADDOCK_DOCS = $(GhcWithInterpreter) +HADDOCK_DOCS = YES # And HsColour the sources? ifeq "$(HSCOLOUR)" "" HSCOLOUR_SRCS = NO -- 1.7.10.4