[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Fix pretty printing of WARNING pragmas

Marge Bot (@marge-bot) gitlab at gitlab.haskell.org
Tue Jul 25 14:48:34 UTC 2023



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


Commits:
822ef66b by Matthew Pickering at 2023-07-25T08:44:50-04:00
Fix pretty printing of WARNING pragmas

There is still something quite unsavoury going on with WARNING pragma
printing because the printing relies on the fact that for decl
deprecations the SourceText of WarningTxt is empty. However, I let that
lion sleep and just fixed things directly.

Fixes #23465

- - - - -
e7b38ede by Matthew Pickering at 2023-07-25T08:45:28-04:00
ci-images: Bump to commit which has 9.6 image

The test-bootstrap job has been failing for 9.6 because we accidentally
used a non-master commit.

- - - - -
bb408936 by Matthew Pickering at 2023-07-25T08:45:28-04:00
Update bootstrap plans for 9.6.2 and 9.4.5

- - - - -
47955806 by Rodrigo Mesquita at 2023-07-25T10:48:28-04:00
configure: Default missing options to False when preparing ghc-toolchain Targets

This commit fixes building ghc with 9.2 as the boostrap compiler.

The ghc-toolchain patch assumed all _STAGE0 options were available, and
forgot to account for this missing information in 9.2.

Ghc 9.2 does not have in settings whether ar supports -l, hence can't
report it with --info (unliked 9.4 upwards).

The fix is to default the missing information (we default "ar supports
-l" and other missing options to False)

- - - - -
98a6e305 by Naïm Favier at 2023-07-25T10:48:31-04:00
docs: Fix typo
- - - - -


7 changed files:

- .gitlab-ci.yml
- compiler/GHC/Hs/Decls.hs
- compiler/GHC/Unit/Module/Warnings.hs
- hadrian/bootstrap/generate_bootstrap_plans
- hadrian/bootstrap/plan-9_2_1.json
- hadrian/bootstrap/plan-9_2_2.json
- hadrian/bootstrap/plan-9_2_3.json


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ec1392f124e1de39c9a9ef5564f266faa6d69058...98a6e305890c9cdc1b8d3481d15735ec1883c817

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ec1392f124e1de39c9a9ef5564f266faa6d69058...98a6e305890c9cdc1b8d3481d15735ec1883c817
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/20230725/b049ef5e/attachment.html>


More information about the ghc-commits mailing list