Andreas Klebinger pushed to branch ghc-9.10 at Glasgow Haskell Compiler / GHC Commits: 5cfea804 by Matthew Pickering at 2026-05-19T14:29:08+02:00 configure: Allow happy-2.0.2 happy-2.0.2 can be used to compile GHC. happy-2.0 and 2.0.1 have bugs which make it unsuitable to use. The version bound is now == 1.20.* || >= 2.0.2 && < 2.1 Fixes #25276 (cherry picked from commit 0029ca91c845dd4530eb2c4606ad5bd59775cec2) - - - - - 25ba2eb8 by Ben Gamari at 2026-05-19T14:32:25+02:00 configure: Accept happy-2.1.2 happy-2.1 was released in late Oct 2024. I have confirmed that master bootstraps with it. Here we teach configure to accept this tool. Fixes #25438. (cherry picked from commit 1fd83f865ffb620f4f7c4c59787710206dcadb90) - - - - - 082efeed by Hai / @BestYeen at 2026-05-19T14:32:32+02:00 Change Alex and Happy m4 scripts to display which version was found in the system, adapt small formatting details in Happy script to be more like the Alex script again. (cherry picked from commit d59ef6b66e36e6b3ef7783c7ea8971ee05818932) - - - - - a4cf3122 by Brian J. Cardiff at 2026-05-19T14:32:42+02:00 configure: Accept happy-2.2 In Jan 2026 happy-2.2 was released. The most sensible change is https://github.com/haskell/happy/issues/335 which didn't trigger in a fresh build (cherry picked from commit 4f2840f2bb729ef1a6660f9f5c46906b7b838147) - - - - - 9c726e17 by Andreas Klebinger at 2026-05-20T08:59:54+02:00 Update ci-images commit - - - - - 3 changed files: - .gitlab-ci.yml - m4/fptools_alex.m4 - m4/fptools_happy.m4 Changes: ===================================== .gitlab-ci.yml ===================================== @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: a9297a370025101b479cfd4977f8f910814e03ab + DOCKER_REV: c33314758e1186208b9f7e926e05469a8cfc0e05 # Sequential version number of all cached things. # Bump to invalidate GitLab CI cache. ===================================== m4/fptools_alex.m4 ===================================== @@ -23,10 +23,16 @@ changequote([, ])dnl ]) if test ! -f compiler/GHC/Parser/Lexer.hs || test ! -f compiler/GHC/Cmm/Lexer.hs then + if test x"$fptools_cv_alex_version" != x; then + fptools_cv_alex_version_display="version $fptools_cv_alex_version"; + else + fptools_cv_alex_version_display="none"; + fi; + failure_msg="Alex version >= 3.2.6 && < 4 is required to compile GHC. (Found: $fptools_cv_alex_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.2.6], - [AC_MSG_ERROR([Alex >= 3.2.6 && < 4 is required to compile GHC.])])[] + [AC_MSG_ERROR([$failure_msg])])[] FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-ge],[4.0.0], - [AC_MSG_ERROR([Alex >= 3.2.6 && < 4 is required to compile GHC.])])[] + [AC_MSG_ERROR([$failure_msg])])[] fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) ===================================== m4/fptools_happy.m4 ===================================== @@ -13,8 +13,7 @@ AC_DEFUN([FPTOOLS_HAPPY], AC_SUBST(HappyCmd,$HAPPY) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, changequote(, )dnl -[ -if test x"$HappyCmd" != x; then +[if test x"$HappyCmd" != x; then fptools_cv_happy_version=`"$HappyCmd" -v | grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'` ; else @@ -24,10 +23,19 @@ changequote([, ])dnl ]) if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs then + if test x"$fptools_cv_happy_version" != x; then + fptools_cv_happy_version_display="version $fptools_cv_happy_version"; + else + fptools_cv_happy_version_display="none"; + fi; + failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.3 is required to compile GHC. (Found: $fptools_cv_happy_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0], - [AC_MSG_ERROR([Happy version 1.20 or later is required to compile GHC.])])[] + [AC_MSG_ERROR([$failure_msg])])[] 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.])])[] + FP_COMPARE_VERSIONS([$fptools_cv_happy_version], [-le], [2.0.1], + [AC_MSG_ERROR([$failure_msg])])[])[] + FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.3.0], + [AC_MSG_ERROR([$failure_msg])])[] fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e37757cfa18c80143e32cbedf15a50b... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e37757cfa18c80143e32cbedf15a50b... You're receiving this email because of your account on gitlab.haskell.org.