[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 13 commits: ci: Enable strict ghc-toolchain setting for bindists

Mon Jun 24 18:31:21 UTC 2024

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

Commits:
0be9498c by Rodrigo Mesquita at 2024-06-24T14:31:00-04:00
ci: Enable strict ghc-toolchain setting for bindists

- - - - -
da69c2f6 by Rodrigo Mesquita at 2024-06-24T14:31:00-04:00
ghc-toolchain: Improve parse failure error

Improves the error message for when `ghc-toolchain` fails to read a
valid `Target` value from a file (in doFormat mode).

- - - - -
d9506cd5 by Rodrigo Mesquita at 2024-06-24T14:31:00-04:00
bindist: ghc-toolchain related options in configure

- - - - -
c96cc561 by Matthew Pickering at 2024-06-24T14:31:00-04:00
ci: Fail when bindist configure fails when installing bindist

It is better to fail earlier if the configure step fails rather than
carrying on for a more obscure error message.

- - - - -
99b752f9 by Rodrigo Mesquita at 2024-06-24T14:31:00-04:00
ghc-toolchain: Fix error logging indentation

- - - - -
2ae890d8 by Rodrigo Mesquita at 2024-06-24T14:31:00-04:00
bindist: Correct default.target substitution

The substitution on `default.target.in` must be done after
`PREP_TARGET_FILE` is called -- that macro is responsible for
setting the variables that will be effectively substituted in the target
file. Otherwise, the target file is invalid.

Fixes #24792 #24574

- - - - -
18bf0f82 by Rodrigo Mesquita at 2024-06-24T14:31:00-04:00
configure: Prefer tool name over tool path

It is non-obvious whether the toolchain configuration should use
full-paths to tools or simply their names. In addressing #24574, we've
decided to prefer executable names over paths, ultimately, because the
bindist configure script already does this, thus is the default in ghcs
out there.

Updates the in-tree configure script to prefer tool names
(`AC_CHECK_TOOL` rather than `AC_PATH_TOOL`) and `ghc-toolchain` to
ignore the full-path-result of `findExecutable`, which it previously
used over the program name.

This change doesn't undo the fix in bd92182cd56140ffb2f68ec01492e5aa6333a8fc
because `AC_CHECK_TOOL` still takes into account the target triples,
unlike `AC_CHECK_PROG/AC_PATH_PROG`.

- - - - -
f3d03914 by Rodrigo Mesquita at 2024-06-24T14:31:01-04:00
dist: Don't forget to configure JavascriptCPP

We introduced a configuration step for the javascript preprocessor, but
only did so for the in-tree configure script.

This commit makes it so that we also configure the javascript
preprocessor in the configure shipped in the compiler bindist.

- - - - -
4637db2d by Rodrigo Mesquita at 2024-06-24T14:31:01-04:00
distrib: LlvmTarget in distrib/configure

LlvmTarget was being set and substituted in the in-tree configure, but
not in the configure shipped in the bindist.

We want to set the LlvmTarget to the canonical LLVM name of the platform
that GHC is targetting.

Currently, that is going to be the boostrapped llvm target (hence the
code which sets LlvmTarget=bootstrap_llvm_target).

- - - - -
3033dd78 by Matthew Pickering at 2024-06-24T14:31:04-04:00
Update bootstrap plans for recent GHC versions (9.6.5, 9.8.2, 9.10.10)

- - - - -
7984e248 by Matthew Pickering at 2024-06-24T14:31:04-04:00
ci: Add 9_10 bootstrap testing job

- - - - -
a3ab7c75 by Hécate Kleidukos at 2024-06-24T14:31:06-04:00
haddock: Move the usage of mkParserOpts directly to ppHyperlinkedModuleSource in order to avoid passing a whole DynFlags

Follow up to !12931

- - - - -
eec82d66 by Hécate Kleidukos at 2024-06-24T14:31:06-04:00
haddock: Remove cabal file linting rule

This will be reintroduced with a properly ignored commit
when the cabal files are themselves formatted for good.

- - - - -

12 changed files:

- .gitlab-ci.yml
- .gitlab/ci.sh
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
- configure.ac
- distrib/configure.ac.in
- hadrian/bootstrap/generate_bootstrap_plans
- + hadrian/bootstrap/plan-9_10_1.json
- hadrian/bootstrap/plan-9_4_1.json
- hadrian/bootstrap/plan-9_4_2.json
- hadrian/bootstrap/plan-9_4_3.json
- hadrian/bootstrap/plan-9_4_4.json

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/82a6da99f0efaa7281bc63a69755e5c14a63697a...eec82d661055dff5c86e7f19dd035051527c37b0

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/82a6da99f0efaa7281bc63a69755e5c14a63697a...eec82d661055dff5c86e7f19dd035051527c37b0
You're receiving this email because of your account on gitlab.haskell.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240624/cc616c75/attachment.html>