X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FLinker.lhs;h=459fbd9e908c48431b468241805f70b7869ace8a;hb=ee7fcd7239ebb5b301e075034a8ff700cd5f40c9;hp=f41a7bab03f2c4a48bf953f403e6a15d5ba70480;hpb=aa9a4f1053d3c554629a2ec25955e7530c95b892;p=ghc-hetmet.git diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index f41a7ba..459fbd9 100644 --- a/compiler/ghci/Linker.lhs +++ b/compiler/ghci/Linker.lhs @@ -75,7 +75,7 @@ import System.FilePath import System.IO import System.Directory -import Distribution.Package hiding (depends) +import Distribution.Package hiding (depends, PackageId) import Exception import Data.Maybe @@ -1131,7 +1131,7 @@ mkSOName root -- name. They are searched for in different paths than normal libraries. loadFramework :: [FilePath] -> FilePath -> IO (Maybe String) loadFramework extraPaths rootname - = do { either_dir <- Exception.try getHomeDirectory + = do { either_dir <- tryIO getHomeDirectory ; let homeFrameworkPath = case either_dir of Left _ -> [] Right dir -> [dir ++ "/Library/Frameworks"]