Skip to content
Snippets Groups Projects
Commit b1ab1bb8 authored by Ryan Scott's avatar Ryan Scott
Browse files

Update ghcide-2.0.0.0 patch to accommodate ghc@5ffc7d7b

parent 7c53b9f6
No related branches found
No related tags found
1 merge request!308Add generic-random, lame, ghc-typelits-* as extra_packages
Checking pipeline status
......@@ -53,6 +53,25 @@ index 1f70e96..3d88b33 100644
requiresTag wflag -- deprecation was already considered above
| wflag `elem` unnecessaryDeprecationWarningFlags
= Just DtUnnecessary
diff --git a/src/Development/IDE/GHC/CPP.hs b/src/Development/IDE/GHC/CPP.hs
index 1cb70cc..680dc11 100644
--- a/src/Development/IDE/GHC/CPP.hs
+++ b/src/Development/IDE/GHC/CPP.hs
@@ -53,8 +53,12 @@ doCpp env input_fn output_fn =
#if MIN_VERSION_ghc(9,5,0)
let cpp_opts = Pipeline.CppOpts
- { cppUseCc = False
- , cppLinePragmas = True
+ { cppLinePragmas = True
+# if MIN_VERSION_ghc(9,9,0)
+ , useHsCpp = True
+# else
+ , cppUseCc = False
+# endif
} in
#else
let cpp_opts = True in
diff --git a/src/Development/IDE/GHC/Compat.hs b/src/Development/IDE/GHC/Compat.hs
index 0f9069b..ccf29fc 100644
--- a/src/Development/IDE/GHC/Compat.hs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment