[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: configure: Don't check for an unsupported version of LLVM

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
57f0fe19 by ARATA Mizuki at 2022-11-15T19:15:51-05:00
configure: Don't check for an unsupported version of LLVM

The upper bound is not inclusive.

Fixes #22449

- - - - -
1388e381 by Bodigrim at 2022-11-15T19:15:55-05:00
Fix capitalization in haddock for TestEquality

- - - - -


2 changed files:

- libraries/base/Data/Type/Equality.hs
- m4/find_llvm_prog.m4


Changes:

=====================================
libraries/base/Data/Type/Equality.hs
=====================================
@@ -152,14 +152,14 @@ deriving instance a ~~ b => Bounded (a :~~: b)
 -- The result should be @Just Refl@ if and only if the types applied to @f@ are
 -- equal:
 --
--- @TestEquality (x :: f a) (y :: f b) = Just Refl ⟺ a = b@
+-- @testEquality (x :: f a) (y :: f b) = Just Refl ⟺ a = b@
 --
 -- Typically, only singleton types should inhabit this class. In that case type
 -- argument equality coincides with term equality:
 --
--- @TestEquality (x :: f a) (y :: f b) = Just Refl ⟺ a = b ⟺ x = y@
+-- @testEquality (x :: f a) (y :: f b) = Just Refl ⟺ a = b ⟺ x = y@
 --
--- @isJust (TestEquality x y) = x == y@
+-- @isJust (testEquality x y) = x == y@
 --
 -- Singleton types are not required, however, and so the latter two would-be
 -- laws are not in fact valid in general.


=====================================
m4/find_llvm_prog.m4
=====================================
@@ -11,7 +11,7 @@
 #
 AC_DEFUN([FIND_LLVM_PROG],[
     # Test for program with and without version name.
-    PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0 $2$llvmVersion"; done)
+    PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $(($4-1)) -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0 $2$llvmVersion"; done)
     AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], [])
     AS_IF([test x"$$1" != x],[
         PROG_VERSION=`$$1 --version | awk '/.*version [[0-9\.]]+/{for(i=1;i<=NF;i++){ if(\$i ~ /^[[0-9\.]]+$/){print \$i}}}'`



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77e0e36f9590033638a60a80765154e15712d252...1388e38149b7098791fef82feef54aeaecd637fe

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77e0e36f9590033638a60a80765154e15712d252...1388e38149b7098791fef82feef54aeaecd637fe
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221115/a597ff5f/attachment-0001.html>