[Git][ghc/ghc][master] 2 commits: Limit upper version of Happy for ghc-9.0 and earlier (#18620)

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
74a7fbff by Takenobu Tani at 2020-08-31T23:05:51-04:00
Limit upper version of Happy for ghc-9.0 and earlier (#18620)

This patch adds the upper bound of a happy version for ghc-9.0
and earlier.

Currently, we can't use happy-1.20.0 for ghc-9.0.

See #18620.

- - - - -
a4473f02 by Takenobu Tani at 2020-08-31T23:05:51-04:00
Limit upper version of Happy for ghc-9.2 (#18620)

This patch adds the upper bound of a happy version for ghc-9.2.

Currently, We can use happy-1.19 or happy-1.20 for ghc-9.2.

See #18620.

- - - - -


2 changed files:

- aclocal.m4
- hadrian/hadrian.cabal


Changes:

=====================================
aclocal.m4
=====================================
@@ -1026,6 +1026,8 @@ if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs
 then
     FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.19.10],
       [AC_MSG_ERROR([Happy version 1.19.10 or later is required to compile GHC.])])[]
+    FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0],
+      [AC_MSG_ERROR([Happy version 1.20 or earlier is required to compile GHC.])])[]
 fi
 HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)


=====================================
hadrian/hadrian.cabal
=====================================
@@ -148,7 +148,7 @@ executable hadrian
                        , transformers         >= 0.4     && < 0.6
                        , unordered-containers >= 0.2.1   && < 0.3
     build-tools:         alex  >= 3.1
-                       , happy >= 1.19.10
+                       , happy >= 1.19.10 && < 1.21
     ghc-options:       -Wall
                        -Wincomplete-record-updates
                        -Wredundant-constraints



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/380ef84587fb6890d100c338d1992a6994a4f02a...a4473f02ae2e685601e257b8668bea2ec721b294

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/380ef84587fb6890d100c338d1992a6994a4f02a...a4473f02ae2e685601e257b8668bea2ec721b294
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/20200831/ddaaed21/attachment.html>