git.iko.soy/project-m36
on master help sign in
add ObjLink support for GHC 7.10
878ba87AgentM
project-m36.cabal+1−2
compare with master
unifiedsplit
@@ -26,7 +26,6 @@ Library
26 Build-Depends: base>=4.8 && < 6.0
26 Build-Depends: base>=4.8 && < 6.0
27 ,ghc >= 7.8 && < 8.3
27 ,ghc >= 7.8 && < 8.3
28 ,ghc-paths
28 ,ghc-paths
29− ,ghci
30 ,mtl
29 ,mtl
31 ,containers
30 ,containers
32 ,unordered-containers
31 ,unordered-containers
@@ -166,7 +165,7 @@ Library
166 Default-Extensions: OverloadedStrings, CPP
165 Default-Extensions: OverloadedStrings, CPP
167 if impl(ghc>= 8)
166 if impl(ghc>= 8)
168 build-depends:
167 build-depends:
169− ghc-boot
168+ ghc-boot, ghci
170
169
171Executable tutd
170Executable tutd
172 Build-Depends: base >=4.8 && <5.0,
171 Build-Depends: base >=4.8 && <5.0,
src/lib/ProjectM36/ScriptSession.hs+3−1
@@ -18,6 +18,9 @@ import GHC
18import GHC.Paths (libdir)
18import GHC.Paths (libdir)
19#if __GLASGOW_HASKELL__ >= 800
19#if __GLASGOW_HASKELL__ >= 800
20import GHC.LanguageExtensions
20import GHC.LanguageExtensions
21+import GHCi.ObjLink
22+#else
23+import ObjLink
21#endif
24#endif
22import DynFlags
25import DynFlags
23import Panic
26import Panic
@@ -28,7 +31,6 @@ import Type
28
31
29import GHC.Exts (addrToAny#)
32import GHC.Exts (addrToAny#)
30import GHC.Ptr (Ptr(..))
33import GHC.Ptr (Ptr(..))
31−import GHCi.ObjLink
32import Encoding
34import Encoding
33
35
34data ScriptSession = ScriptSession {
36data ScriptSession = ScriptSession {