wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support GHC 7.10. Add new GitHub URL. Add Travis.

Browse Source
This commit is contained in:
Franklin Chen
2015-10-09 14:18:21 -04:00
parent 6e9c954e60
commit 53a0f5b97b
6 changed files with 206 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/System/Plugins/Load.hs
View File

@ -72,7 +72,11 @@ import System.Plugins.LoadTypes
-- import Language.Hi.Parser
import BinIface
import HscTypes
#if MIN_VERSION_ghc(7,10,0)
import Module (moduleName, moduleNameString, packageKeyString)
#else
import Module (moduleName, moduleNameString, packageIdString)
#endif
import HscMain (newHscEnv)
import TcRnMonad (initTcRnIf)
@ -701,7 +705,9 @@ loadDepends obj incpaths = do
-- and find some packages to load, as well.
let ps = dep_pkgs ds
#if MIN_VERSION_ghc(7,2,0)
#if MIN_VERSION_ghc(7,10,0)
ps' <- filterM loaded . map packageKeyString . nub $ map fst ps
#elif MIN_VERSION_ghc(7,2,0)
ps' <- filterM loaded . map packageIdString . nub $ map fst ps
#else
ps' <- filterM loaded . map packageIdString . nub $ ps