on master help sign in
Ghc lib 8.8.0.20190723 (#2279)

* Upgrade ghc-lib * Patch bazel_tools : hazel-include-paths patch, no-isystem patch. * Provide "haskell_c2hs" for package name to cabal_haskell_package * Package name haskell_c2hs => c2hs. * Switch to less hacky patch for include dirs

commite41f17c96995970d2bc0a5edf35240620459ed0b authorShayne Fletcher <shayne.fletcher@digitalasset.com> dateThu 25 Jul 2019, 04:59 (7 years ago) parent26986fe
1 file changed+8
src/Development/IDE/GHC/CPP.hs+8
src/Development/IDE/GHC/CPP.hs+8
@@ -24,6 +24,9 @@ import Module
2424import DynFlags
2525import Panic
2626import FileCleanup
27+#ifndef GHC_STABLE
28+import LlvmCodeGen (LlvmVersion (..))
29+#endif
2730
2831import System.Directory
2932import System.FilePath
@@ -130,7 +133,12 @@ getBackendDefs :: DynFlags -> IO [String]
130133getBackendDefs dflags | hscTarget dflags == HscLlvm = do
131134 llvmVer <- figureLlvmVersion dflags
132135 return $ case llvmVer of
136+#ifdef GHC_STABLE
133137 Just n -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format n ]
138+#else
139+ Just (LlvmVersion n) -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (n,0) ]
140+ Just (LlvmVersionOld m n) -> [ "-D__GLASGOW_HASKELL_LLVM__=" ++ format (m,n) ]
141+#endif
134142 _ -> []
135143 where
136144 format (major, minor)