Skip to content

Commit fb17921

Browse files
committed
Allow building HLS with GHC 9.10.2
1 parent 173b5a7 commit fb17921

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ghcide/src/Development/IDE/GHC/CPP.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import qualified GHC.Driver.Pipeline.Execute as Pipeline
3030
import qualified GHC.SysTools.Cpp as Pipeline
3131
#endif
3232

33-
#if MIN_VERSION_ghc(9,11,0)
33+
#if MIN_VERSION_ghc(9,10,2)
3434
import qualified GHC.SysTools.Tasks as Pipeline
3535
#endif
3636

@@ -56,7 +56,7 @@ doCpp env input_fn output_fn =
5656
#if MIN_VERSION_ghc(9,5,0)
5757
let cpp_opts = Pipeline.CppOpts
5858
{ cppLinePragmas = True
59-
#if MIN_VERSION_ghc(9,11,0)
59+
#if MIN_VERSION_ghc(9,10,2)
6060
, sourceCodePreprocessor = Pipeline.SCPHsCpp
6161
#elif MIN_VERSION_ghc(9,10,0)
6262
, useHsCpp = True

ghcide/src/Development/IDE/GHC/Compat/Core.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ initObjLinker env =
702702
loadDLL :: HscEnv -> String -> IO (Maybe String)
703703
loadDLL env str = do
704704
res <- GHCi.loadDLL (GHCi.hscInterp env) str
705-
#if MIN_VERSION_ghc(9,11,0) || (MIN_VERSION_ghc(9, 8, 3) && !MIN_VERSION_ghc(9, 9, 0))
705+
#if MIN_VERSION_ghc(9,11,0) || (MIN_VERSION_ghc(9, 8, 3) && !MIN_VERSION_ghc(9, 9, 0)) || (MIN_VERSION_ghc(9, 10, 2) && !MIN_VERSION_ghc(9, 11, 0))
706706
pure $
707707
case res of
708708
Left err_msg -> Just err_msg

0 commit comments

Comments
 (0)