add ObjLink support for GHC 7.10
commit878ba87eb51053a411dc78e920de3923b3cbda7b
authorAgentM <agentm@themactionfaction.com>
dateTue 15 May 2018, 13:26 (8 years ago)
parent3c9dd47
project-m36.cabal+1−2
@@ -26,7 +26,6 @@ Library
2626 Build-Depends: base>=4.8 && < 6.0
2727 ,ghc >= 7.8 && < 8.3
2828 ,ghc-paths
29− ,ghci
3029 ,mtl
3130 ,containers
3231 ,unordered-containers
@@ -166,7 +165,7 @@ Library
166165 Default-Extensions: OverloadedStrings, CPP
167166 if impl(ghc>= 8)
168167 build-depends:
169− ghc-boot
168+ ghc-boot, ghci
170169
171170Executable tutd
172171 Build-Depends: base >=4.8 && <5.0,
src/lib/ProjectM36/ScriptSession.hs+3−1
@@ -18,6 +18,9 @@ import GHC
1818import GHC.Paths (libdir)
1919#if __GLASGOW_HASKELL__ >= 800
2020import GHC.LanguageExtensions
21+import GHCi.ObjLink
22+#else
23+import ObjLink
2124#endif
2225import DynFlags
2326import Panic
@@ -28,7 +31,6 @@ import Type
2831
2932import GHC.Exts (addrToAny#)
3033import GHC.Ptr (Ptr(..))
31−import GHCi.ObjLink
3234import Encoding
3335
3436data ScriptSession = ScriptSession {