[commit: haddock] master: Workaround for a failing build with --enable-tests. (3580d64)

Simon Hengel sol at typeful.net
Sat Jun 1 18:50:01 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3580d649f152c103489580b82c0a323e66a06880

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

commit 3580d649f152c103489580b82c0a323e66a06880
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Tue May 21 01:56:04 2013 +0100

    Workaround for a failing build with --enable-tests.

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

 html-test/run.lhs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/html-test/run.lhs b/html-test/run.lhs
index 7d3b805..1ce3e79 100755
--- a/html-test/run.lhs
+++ b/html-test/run.lhs
@@ -71,7 +71,7 @@ test = do
 
   -- TODO: maybe do something more clever here using haddock.cabal
   ghcPath <- fmap init $ rawSystemStdout normal haddockPath ["--print-ghc-path"]
-  (_, conf) <- configure normal (Just ghcPath) Nothing defaultProgramConfiguration
+  (_, _, conf) <- configure normal (Just ghcPath) Nothing defaultProgramConfiguration
   pkgIndex <- getInstalledPackages normal [GlobalPackageDB] conf
   let mkDep pkgName =
         fromMaybe (error "Couldn't find test dependencies") $ do





More information about the ghc-commits mailing list