diff options
| author | Zubin Duggal <zubin.duggal@gmail.com> | 2021-06-17 16:25:46 +0530 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-06-20 07:13:07 -0400 |
| commit | 6c783817ef089e85642c3383937117cff9d15f67 (patch) | |
| tree | 90266d7337b67a7703c88db0a9a668c19f02ff2f /compiler/GHC/SysTools | |
| parent | 4a65c0f88060785a8bcb25bb13bc53c20948633b (diff) | |
| download | haskell-6c783817ef089e85642c3383937117cff9d15f67.tar.gz | |
Set min LLVM version to 9 and make version checking use a non-inclusive upper
bound.
We use a non-inclusive upper bound so that setting the upper bound to 13 for
example means that all 12.x versions are accepted.
Diffstat (limited to 'compiler/GHC/SysTools')
| -rw-r--r-- | compiler/GHC/SysTools/Tasks.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/GHC/SysTools/Tasks.hs b/compiler/GHC/SysTools/Tasks.hs index 6fec3a8839..7c1ea332cf 100644 --- a/compiler/GHC/SysTools/Tasks.hs +++ b/compiler/GHC/SysTools/Tasks.hs @@ -14,7 +14,7 @@ import GHC.Platform import GHC.ForeignSrcLang import GHC.IO (catchException) -import GHC.CmmToLlvm.Base (LlvmVersion, llvmVersionStr, supportedLlvmVersionMin, supportedLlvmVersionMax, llvmVersionStr, parseLlvmVersion) +import GHC.CmmToLlvm.Base (LlvmVersion, llvmVersionStr, supportedLlvmVersionLowerBound, supportedLlvmVersionUpperBound, llvmVersionStr, parseLlvmVersion) import GHC.SysTools.Process import GHC.SysTools.Info @@ -236,10 +236,11 @@ figureLlvmVersion logger dflags = traceToolCommand logger "llc" $ do errorMsg logger $ vcat [ text "Warning:", nest 9 $ text "Couldn't figure out LLVM version!" $$ - text ("Make sure you have installed LLVM between " - ++ llvmVersionStr supportedLlvmVersionMin + text ("Make sure you have installed LLVM between [" + ++ llvmVersionStr supportedLlvmVersionLowerBound ++ " and " - ++ llvmVersionStr supportedLlvmVersionMax) ] + ++ llvmVersionStr supportedLlvmVersionUpperBound + ++ ")") ] return Nothing) |