diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-05-30 14:00:48 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-05-30 14:00:48 +0000 |
| commit | b30f5ecfdae9dea8048c19051732b71f7633f9c9 (patch) | |
| tree | 1ef8607d8616290b9d2bb774e1df37df6ebebe36 /src/Main.hs | |
| parent | 3fe640b29fccb30943612ec1b99b8cd1dbc0fa9f (diff) | |
update to compile with the latest GHC & Cabal
Diffstat (limited to 'src/Main.hs')
| -rw-r--r-- | src/Main.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Main.hs b/src/Main.hs index e5132378..cf534560 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -17,7 +17,7 @@ import Haddock.Version import Haddock.InterfaceFile import Haddock.Exception import Haddock.Utils.GHC -import Paths_haddock ( getDataDir ) +import Paths_haddock_ghc ( getDataDir ) import Prelude hiding ( catch ) import Control.Exception @@ -47,7 +47,7 @@ import qualified Data.Map as Map import Data.Map (Map) import Distribution.InstalledPackageInfo ( InstalledPackageInfo(..) ) -import Distribution.Simple.Utils +import Distribution.Simple.Utils ( withTempFile ) import GHC import Outputable @@ -301,12 +301,12 @@ byeVersion = startGHC :: String -> IO (Session, DynFlags) startGHC libDir = do - --let ghcMode = BatchCompile - session <- newSession (Just libDir) + let ghcMode = BatchCompile + session <- newSession ghcMode (Just libDir) flags <- getSessionDynFlags session flags' <- liftM fst (initPackages flags) let flags'' = dopt_set flags' Opt_Haddock - return (session, flags'') + return (session, flags'' { hscTarget = HscNothing }) -- TODO: clean up, restructure and make sure it handles cleanup sortAndCheckModules :: Session -> [FilePath] -> IO [CheckedMod] @@ -1044,7 +1044,7 @@ buildGlobalDocEnv modules keep_new env n = Map.insert n (nameSetMod n modName) env nameSetMod n newMod = mkExternalName (nameUnique n) newMod (nameOccName n) - (nameSrcSpan n) + (nameSrcLoc n) -- ----------------------------------------------------------------------------- -- Named documentation |