hasufell
/
ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'kazu/master'

This commit is contained in:
Alejandro Serrano 2014-07-19 10:13:19 +02:00
parent 6302d4882e 5abd75ea7d
commit 60e97d4579
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Language/Haskell/GhcMod/Find.hs
View File

@ -32,7 +32,7 @@ import Language.Haskell.GhcMod.Utils
import Language.Haskell.GhcMod.Types
import Name (getOccString)
import System.Directory (doesDirectoryExist, getAppUserDataDirectory, doesFileExist, getModificationTime)
import System.FilePath ((</>))
import System.FilePath ((</>), takeDirectory)
import System.IO
import System.Environment (getExecutablePath)
@ -88,11 +88,12 @@ loadSymbolDb :: IO SymbolDb
loadSymbolDb = SymbolDb <$> readSymbolDb
ghcModExecutable :: IO FilePath
ghcModExecutable =
#ifndef SPEC
getExecutablePath
ghcModExecutable = do
dir <- takeDirectory <$> getExecutablePath
return $ dir </> "ghc-mod"
#else
return "dist/build/ghc-mod/ghc-mod"
ghcModExecutable = return "dist/build/ghc-mod/ghc-mod"
#endif
readSymbolDb :: IO (Map Symbol [ModuleString])