git.iko.soy/ghcide
on master help sign in
compiler: follow ghc convention and put conf files in package.conf.d dir (#978)

* compiler: follow ghc convention and put conf files in package.conf.d dir We follow the ghc convention and locate all .conf files for the package database in the `package.conf.d` dir. * addressed neil's comment

commit73b9de253690b22f9198bd27f0b0c355e0f9ab99 authorRobin Krom <robin@digitalasset.com> dateWed 8 May 2019, 14:23 (7 years ago) parent56d7dac
1 file changed+2−1
compare with master
unifiedsplit
src/Development/IDE/UtilGHC.hs+2−1
src/Development/IDE/UtilGHC.hs+2−1
@@ -29,6 +29,7 @@ import qualified Packages
2929import Platform
3030import qualified EnumSet
3131import Data.IORef
32+import System.FilePath
3233import GHC.Generics (Generic)
3334
3435----------------------------------------------------------------------
@@ -38,7 +39,7 @@ setPackageDbs :: [FilePath] -> DynFlags -> DynFlags
3839setPackageDbs paths dflags =
3940 dflags
4041 { packageDBFlags =
41− [PackageDB $ PkgConfFile path | path <- paths] ++ [NoGlobalPackageDB, ClearPackageDBs]
42+ [PackageDB $ PkgConfFile $ path </> "package.conf.d" | path <- paths] ++ [NoGlobalPackageDB, ClearPackageDBs]
4243 , pkgDatabase = if null paths then Just [] else Nothing
4344 -- if we don't load any packages set the package database to empty and loaded.
4445 , settings = (settings dflags)