From e89a5563574f7451393ca4fbea2f5b7c68708ebe Mon Sep 17 00:00:00 2001
From: Takenobu Tani <takenobu.hs@gmail.com>
Date: Sun, 30 Aug 2020 12:45:16 +0900
Subject: [PATCH] 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.
(cherry picked from commit 74a7fbff5a8f244cd44345bf987e26413bb1989e)
---
aclocal.m4 | 2 ++
hadrian/hadrian.cabal | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 832eb5441de6..50cb1bbc7d13 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1036,6 +1036,8 @@ if test ! -f compiler/parser/Parser.hs || test ! -f compiler/cmm/CmmParse.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.20.0],
+ [AC_MSG_ERROR([Happy version 1.19 is required to compile GHC.])])[]
fi
HappyVersion=$fptools_cv_happy_version;
AC_SUBST(HappyVersion)
diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal
index 8bb041d8becd..cf0bcc481aae 100644
--- a/hadrian/hadrian.cabal
+++ b/hadrian/hadrian.cabal
@@ -147,7 +147,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.20
ghc-options: -Wall
-Wincomplete-record-updates
-Wredundant-constraints
--
GitLab