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

Fix race condition in stack support code

Browse Source
This commit is contained in:
Daniel Gröber
2015-09-11 03:48:52 +02:00
parent 12d65ba11f
commit 211b957451
9 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Language/Haskell/GhcMod/Debug.hs
View File

@@ -26,9 +26,9 @@ debugInfo = do
Cradle {..} <- cradle
cabal <-
case cradleProjectType of
case cradleProject of
CabalProject -> cabalDebug
StackProject -> (++) <$> stackPaths <*> cabalDebug
StackProject {} -> (++) <$> stackPaths <*> cabalDebug
_ -> return []
pkgOpts <- packageGhcOptions
@@ -45,9 +45,9 @@ debugInfo = do
stackPaths :: IOish m => GhcModT m [String]
stackPaths = do
Cradle {..} <- cradle
Just ghc <- getStackGhcPath cradleRootDir
Just ghcPkg <- getStackGhcPkgPath cradleRootDir
Cradle { cradleProject = StackProject senv } <- cradle
ghc <- getStackGhcPath senv
ghcPkg <- getStackGhcPkgPath senv
return $
[ "Stack ghc executable: " ++ show ghc
, "Stack ghc-pkg executable:" ++ show ghcPkg
@@ -64,7 +64,7 @@ cabalDebug = do
return $
[ "Cabal file: " ++ show cradleCabalFile
, "Cabal Project Type: " ++ show cradleProjectType
, "Project: " ++ show cradleProject
, "Cabal entrypoints:\n" ++ render (nest 4 $
mapDoc gmComponentNameDoc smpDoc entrypoints)
, "Cabal components:\n" ++ render (nest 4 $