summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2020-12-21 11:57:48 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-12-22 10:39:00 -0500
commit4c3fae472c0223dbbf8062cd7ab1e24b3e9c01c6 (patch)
treea32aae0a8228aa0627ab2a8197d66dfa64256238
parent932ee6de679faa54840a3902d528f12ccfe44d16 (diff)
downloadhaskell-4c3fae472c0223dbbf8062cd7ab1e24b3e9c01c6.tar.gz
Require alex < 3.2.6
A workaround for #19099.
-rw-r--r--aclocal.m42
-rw-r--r--hadrian/hadrian.cabal3
2 files changed, 4 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 47fbdb1bc2..d81a7de5ca 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1104,6 +1104,8 @@ if test ! -f compiler/GHC/Parser/Lexer.hs || test ! -f compiler/GHC/Cmm/Lexer.hs
then
FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.7],
[AC_MSG_ERROR([Alex version 3.1.7 or later is required to compile GHC.])])[]
+ FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-ge],[3.2.6],
+ [AC_MSG_ERROR([Alex version 3.2.5 or earlier is required to compile GHC. See GHC issue 19099 for more information.])])[]
fi
AlexVersion=$fptools_cv_alex_version;
AC_SUBST(AlexVersion)
diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal
index be2385262b..3bca30ff23 100644
--- a/hadrian/hadrian.cabal
+++ b/hadrian/hadrian.cabal
@@ -146,7 +146,8 @@ executable hadrian
, shake >= 0.18.3 && < 0.20
, transformers >= 0.4 && < 0.6
, unordered-containers >= 0.2.1 && < 0.3
- build-tools: alex >= 3.1
+ build-tools: alex >= 3.1 && < 3.2.6
+ -- See GHC#19099 for why we constrain alex < 3.2.6.
, happy >= 1.20.0 && < 1.21
ghc-options: -Wall
-Wincomplete-record-updates