GitLab

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:

0e0e8c03

by Andreas Klebinger at 2026-03-15T15:35:28-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

77273976
by Simon Hengel at 2026-03-15T15:35:29-04:00
```
Fix typo in recursive_do.rst
```

2 changed files:

docs/users_guide/exts/recursive_do.rst
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

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])