Cheng Shao pushed to branch wip/bump-submodules-2603 at Glasgow Haskell Compiler / GHC Commits: 43638643 by Andreas Klebinger at 2026-03-15T18:15:48-04:00 Configure: Fix check for --target support in stage0 CC The check FP_PROG_CC_LINKER_TARGET used $CC unconditionally to check for --target support. However this fails for the stage0 config where the C compiler used is not $CC but $CC_STAGE0. Since we already pass the compiler under test into the macro I simply changed it to use that instead. Fixes #26999 - - - - - 18fd0df6 by Simon Hengel at 2026-03-15T18:16:33-04:00 Fix typo in recursive_do.rst - - - - - ab10d72d by Cheng Shao at 2026-03-16T14:06:11+00:00 hadrian: add thLift/thQuasiquoter to toolTargets This commit adds missing `thLift`/`thQuasiquoter` to hadrian `toolTargets` to keep in sync with `stage0packages`. This is now required when os-string/filepath is updated to include them as dependencies. - - - - - e1cd5fad by Cheng Shao at 2026-03-16T14:06:11+00:00 libraries: bump os-string submodule to 2.0.10 - - - - - ff440778 by Cheng Shao at 2026-03-16T14:06:11+00:00 libraries: bump filepath submodule to 1.5.5.0 - - - - - 5 changed files: - docs/users_guide/exts/recursive_do.rst - hadrian/src/Rules/ToolArgs.hs - libraries/filepath - libraries/os-string - m4/fp_prog_cc_linker_target.m4 Changes: ===================================== docs/users_guide/exts/recursive_do.rst ===================================== @@ -56,7 +56,7 @@ or equivalently As you can guess ``justOnes`` will evaluate to ``Just [-1,-1,-1,...``. -GHC's implementation the mdo-notation closely follows the original +GHC's implementation of the mdo-notation closely follows the original translation as described in the paper `A recursive do for Haskell <https://leventerkok.github.io/papers/recdo.pdf>`__, which in turn is based on the work `Value Recursion in Monadic ===================================== hadrian/src/Rules/ToolArgs.hs ===================================== @@ -153,6 +153,9 @@ toolTargets = [ cabalSyntax , filepath , fileio , osString + -- os-string/filepath now depend on them + , thLift + , thQuasiquoter -- , ghc -- # depends on ghc library -- , runGhc -- # depends on ghc library , ghcBoot @@ -200,4 +203,3 @@ dirMap = do cd <- readContextData c ids <- liftIO $ mapM canonicalizePath [pkgPath p </> i | i <- srcDirs cd] return $ map (,(p, modules cd ++ otherModules cd)) ids - ===================================== libraries/filepath ===================================== @@ -1 +1 @@ -Subproject commit cbcd0ccf92f47e6c10fb9cc513a7b26facfc19fe +Subproject commit baac7d7e76449f76fc6785e77206edb5530b6bfb ===================================== libraries/os-string ===================================== @@ -1 +1 @@ -Subproject commit c08666bf7bf528e607fc1eacc20032ec59e69df3 +Subproject commit 71f66e1af2288867becaa567dfb10c1d791b0343 ===================================== m4/fp_prog_cc_linker_target.m4 ===================================== @@ -8,7 +8,7 @@ # a linker AC_DEFUN([FP_PROG_CC_LINKER_TARGET], [ - AC_MSG_CHECKING([whether $CC used as a linker understands --target]) + AC_MSG_CHECKING([whether $1 used as a linker understands --target]) echo 'int foo() { return 0; }' > conftest1.c echo 'int main() { return 0; }' > conftest2.c @@ -20,7 +20,7 @@ AC_DEFUN([FP_PROG_CC_LINKER_TARGET], # See Note [Don't pass --target to emscripten toolchain] in GHC.Toolchain.Program CONF_CC_SUPPORTS_TARGET=NO AC_MSG_RESULT([no]) - elif "$CC" $$3 --target=$LlvmTarget -o conftest conftest1.o conftest2.o; + elif "$1" $$3 --target=$LlvmTarget -o conftest conftest1.o conftest2.o; then $3="--target=$LlvmTarget $$3" AC_MSG_RESULT([yes]) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7b6ace16cff80e9b548519ee658bdb4... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7b6ace16cff80e9b548519ee658bdb4... You're receiving this email because of your account on gitlab.haskell.org.