Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 21652422 by Andreas Klebinger at 2026-03-15T09:42:41-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 - - - - - 9643fb37 by Simon Hengel at 2026-03-15T09:42:42-04:00 Fix typo in recursive_do.rst - - - - - 1c832db3 by mangoiv at 2026-03-15T09:42:43-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 - - - - - 1ba82b28 by Matthew Pickering at 2026-03-15T09:42:44-04:00 Add missing req_interp modifier to T18441fail3 and T18441fail19 These tests require the interpreter but they were failing in a different way with the javascript backend because the interpreter was disabled and stderr is ignored by the test. - - - - - 4 changed files: - .gitlab/ci.sh - docs/users_guide/exts/recursive_do.rst - m4/fp_prog_cc_linker_target.m4 - testsuite/tests/ghc-e/should_fail/all.T 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 ===================================== 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]) ===================================== testsuite/tests/ghc-e/should_fail/all.T ===================================== @@ -25,7 +25,7 @@ test('T18441fail1', req_interp, makefile_test, ['T18441fail1']) test('T18441fail2', [req_interp, normalise_version('ghc')], makefile_test, ['T18441fail2']) -test('T18441fail3', [ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":! abcde"']) +test('T18441fail3', [req_interp, ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":! abcde"']) test('T18441fail4', req_interp, makefile_test, ['T18441fail4']) @@ -57,7 +57,7 @@ test('T18441fail17', req_interp, makefile_test, ['T18441fail17']) test('T18441fail18', req_interp, makefile_test, ['T18441fail18']) -test('T18441fail19', [ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":cd abcd"']) +test('T18441fail19', [req_interp, ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":cd abcd"']) test('T23663', [req_interp, normalise_version('ghc')], makefile_test, ['T23663']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1b6e5bd127b87a8184a22c7bb8c9e18... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1b6e5bd127b87a8184a22c7bb8c9e18... You're receiving this email because of your account on gitlab.haskell.org.