GitLab

498f06e7

by Rodrigo Mesquita at 2025-07-25T10:38:48+01:00

Bump CI GHC to 9.10.2

Unblocks !14543

Unblocks !14544

@@ -446,7 +446,6 @@ opsysVariables _ FreeBSD14 = mconcat
      -- Prefer to use the system's clang-based toolchain and not gcc
    , "CC" =: "cc"
    , "CXX" =: "c++"
 -  , "GHC_VERSION" =: "9.6.4"
+   ]
  opsysVariables arch (Linux distro) = distroVariables arch distro
  opsysVariables AArch64 (Darwin {}) = mconcat
@@ -476,7 +475,6 @@ opsysVariables _ (Windows {}) = mconcat
    [ "MSYSTEM" =: "CLANG64"
    , "LANG" =: "en_US.UTF-8"
    , "HADRIAN_ARGS" =: "--docs=no-sphinx-pdfs"
 -  , "GHC_VERSION" =: "9.6.4"
+   ]
  opsysVariables _ _ = mempty
@@ -883,6 +881,7 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} }
        , "CONFIGURE_ARGS" =: configureArgsStr buildConfig
        , "INSTALL_CONFIGURE_ARGS" =: "--enable-strict-ghc-toolchain-check"
        , "CABAL_INSTALL_VERSION" =: "3.12.1.0"
 +      , "GHC_VERSION" =: "9.10.2"
        , maybe mempty ("CONFIGURE_WRAPPER" =:) (configureWrapper buildConfig)
        , maybe mempty ("CROSS_TARGET" =:) (crossTarget buildConfig)
        , case crossEmulator buildConfig of

@@ -219,7 +219,7 @@ if test "$WithGhc" = ""
  then
      AC_MSG_ERROR([GHC is required.])
  fi
 -MinBootGhcVersion="9.6"
 +MinBootGhcVersion="9.10"
  FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[$MinBootGhcVersion],
      [AC_MSG_ERROR([GHC version $MinBootGhcVersion or later is required to compile GHC.])])