diff options
author | David Waern <david.waern@gmail.com> | 2009-03-27 00:07:26 +0000 |
---|---|---|
committer | David Waern <david.waern@gmail.com> | 2009-03-27 00:07:26 +0000 |
commit | d7c352b108c1c0b12abca1184f1d71380556d823 (patch) | |
tree | dcf0b6ffade3878e9e848807bea208ddcebe7843 /src/Main.hs | |
parent | 618c9049612b1a8e4a7d3955e54c10446af94778 (diff) |
Fix conflicts
Diffstat (limited to 'src/Main.hs')
-rw-r--r-- | src/Main.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Main.hs b/src/Main.hs index e12d5e04..e1f276cf 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -176,7 +176,8 @@ main = handleTopExceptions $ do -- create the interfaces -- this is the core part of Haddock - (interfaces, homeLinks) <- createInterfaces fileArgs extLinks flags + (interfaces, homeLinks) <- createInterfaces verbosity fileArgs flags + (map fst packages) liftIO $ do -- render the interfaces @@ -192,7 +193,8 @@ main = handleTopExceptions $ do packages <- readInterfaceFiles (nameCacheFromGhc session) (ifacePairs flags) -- create the interfaces -- this is the core part of Haddock - (interfaces, homeLinks) <- createInterfaces session fileArgs extLinks flags + (interfaces, homeLinks) <- createInterfaces verbosity session fileArgs flags + (map fst packages) -- render the interfaces renderStep packages interfaces |