aboutsummaryrefslogtreecommitdiff
path: root/src/Main.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Main.hs')
-rw-r--r--src/Main.hs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Main.hs b/src/Main.hs
index cf534560..9f7ff25f 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_ghc ( getDataDir )
+import Paths_haddock ( 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 ( withTempFile )
+import Distribution.Simple.Utils
import GHC
import Outputable
@@ -301,8 +301,7 @@ byeVersion =
startGHC :: String -> IO (Session, DynFlags)
startGHC libDir = do
- let ghcMode = BatchCompile
- session <- newSession ghcMode (Just libDir)
+ session <- newSession (Just libDir)
flags <- getSessionDynFlags session
flags' <- liftM fst (initPackages flags)
let flags'' = dopt_set flags' Opt_Haddock
@@ -1044,7 +1043,7 @@ buildGlobalDocEnv modules
keep_new env n = Map.insert n (nameSetMod n modName) env
nameSetMod n newMod = mkExternalName (nameUnique n) newMod (nameOccName n)
- (nameSrcLoc n)
+ (nameSrcSpan n)
-- -----------------------------------------------------------------------------
-- Named documentation