git.iko.soy/ghcide
on master help sign in
Fix the build for ghc-8.8.2. (#335)

* Fix the build for ghc-8.8.2. * Match the single-element list first. Co-Authored-By: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>

commit2f5d0d3e69abb5f321bf28b1049ae7a7fc9f619e authorRob Rix <robrix@github.com> dateTue 21 Jan 2020, 08:30 (7 years ago) parent6d0b6ea
1 file changed+8−2
compare with master
unifiedsplit
src/Development/IDE/GHC/CPP.hs+8−2
src/Development/IDE/GHC/CPP.hs+8−2
@@ -28,7 +28,9 @@ import Module
2828import DynFlags
2929import Panic
3030import FileCleanup
31−#if MIN_GHC_API_VERSION(8,8,0)
31+#if MIN_GHC_API_VERSION(8,8,2)
32+import LlvmCodeGen (LlvmVersion, llvmVersionList)
33+#elif MIN_GHC_API_VERSION(8,8,0)
3234import LlvmCodeGen (LlvmVersion (..))
3335#endif
3436
@@ -139,7 +141,11 @@ getBackendDefs :: DynFlags -> IO [String]
139141getBackendDefs dflags | hscTarget dflags == HscLlvm = do
140142 llvmVer <- figureLlvmVersion dflags
141143 return $ case llvmVer of
142−#if MIN_GHC_API_VERSION(8,8,0)
144+#if MIN_GHC_API_VERSION(8,8,2)
145+ Just v
146+ | [m] <- llvmVersionList v -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (m, 0) ]
147+ | m:n:_ <- llvmVersionList v -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (m, n) ]
148+#elif MIN_GHC_API_VERSION(8,8,0)
143149 Just (LlvmVersion n) -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (n,0) ]
144150 Just (LlvmVersionOld m n) -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (m,n) ]
145151#else