Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 9fb29550 by Andreas Klebinger at 2026-03-15T12:14:00-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 - - - - - ed0f429d by Simon Hengel at 2026-03-15T12:14:01-04:00 Fix typo in recursive_do.rst - - - - - 8d8140df by mangoiv at 2026-03-15T12:14:02-04:00 ci: allow nix-build to build derivations locally Substitutes may fail due to network or related issues (e.g. rate limiting. In these cases we want to just build the derivations ourselves. Achieved by passing --fallback to the `nix-build` command - - - - - bd7ca701 by Cheng Shao at 2026-03-15T12:14:03-04:00 libraries: bump os-string submodule to 2.0.10 - - - - - 1ad536fb by Cheng Shao at 2026-03-15T12:14:03-04:00 libraries: bump filepath submodule to 1.5.5.0 - - - - - 5 changed files: - .gitlab/ci.sh - docs/users_guide/exts/recursive_do.rst - libraries/filepath - libraries/os-string - m4/fp_prog_cc_linker_target.m4 Changes: ===================================== .gitlab/ci.sh ===================================== @@ -207,7 +207,7 @@ function set_toolchain_paths() { *) fail "unknown NIX_SYSTEM" ;; esac info "Building toolchain for $NIX_SYSTEM" - nix-build --quiet .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh + nix-build --fallback --quiet .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh fi source toolchain.sh ;; ===================================== 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 ===================================== 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/1ba82b2848c195b35742627cc6bab88... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1ba82b2848c195b35742627cc6bab88... You're receiving this email because of your account on gitlab.haskell.org.