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

a bug fix of missing cabal dir.

Browse Source
This commit is contained in:
Kazu Yamamoto 2013-05-13 12:57:58 +09:00
parent b632cb6df0
commit 5c7bd86122
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CabalApi.hs
View File

@ -42,11 +42,11 @@ cookInfo :: [String] -> Cradle -> GenericPackageDescription -> BuildInfo
-> ([GHCOption],[IncludeDir],[Package])
cookInfo ghcOptions cradle cabal binfo = (gopts,idirs,depPkgs)
where
owdir = cradleCurrentDir cradle
wdir = cradleCurrentDir cradle
Just cdir = cradleCabalDir cradle
Just cfile = cradleCabalFile cradle
gopts = getGHCOptions ghcOptions binfo
idirs = includeDirectories cdir owdir $ cabalAllSourceDirs cabal
idirs = includeDirectories cdir wdir $ cabalAllSourceDirs cabal
depPkgs = removeMe cfile $ cabalAllDependPackages cabal
removeMe :: FilePath -> [String] -> [String]
@ -119,8 +119,8 @@ fromPackageDescription f1 f2 f3 f4 pd = lib ++ exe ++ tests ++ bench
----------------------------------------------------------------
includeDirectories :: String -> String -> [FilePath] -> [String]
includeDirectories cdir owdir [] = uniqueAndSort [cdir,owdir]
includeDirectories cdir owdir dirs = uniqueAndSort (map (cdir </>) dirs ++ [owdir])
includeDirectories cdir wdir [] = uniqueAndSort [cdir,wdir]
includeDirectories cdir wdir dirs = uniqueAndSort (map (cdir </>) dirs ++ [cdir,wdir])
----------------------------------------------------------------