From ffcf4dadc53fe9335ae9df30f3de0aaa08a4f46c Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Mon, 21 Dec 2020 11:57:48 -0500 Subject: Require alex < 3.2.6 A workaround for #19099. --- aclocal.m4 | 2 ++ hadrian/hadrian.cabal | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1