Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cabal: Take into account compilerBuildWay when computing final library ways (backport #10419) #10422

Merged
merged 2 commits into from
Oct 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 4, 2024

In the profiling dynamic patch I made a mistake when computing the needed ways for a build.

When building an executable, the Haskell modules need to be built

  • For the final link way
  • For the build way of the compiler if TH is enabled

Before this patch, the modules were being built for all the configured library ways, which built modules in more configurations than the previous version of Cabal.

Fixes #10418

Please read Github PR Conventions and then fill in one of these two templates.


Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • Manual QA notes have been included.
  • Tests have been added. (Ask for help if you don’t know how to write them! Ask for an exemption if tests are too complex for too little coverage!)

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

This is an automatic backport of pull request #10419 done by [Mergify](https://mergify.com).

…y ways

In the profiling dynamic patch I made a mistake when computing the
needed ways for a build.

When building an executable, the Haskell modules need to be built

* For the final link way
* For the build way of the compiler if TH is enabled

Before this patch, the modules were being built for all the configured
library ways, which built modules in more configurations than the
previous version of Cabal.

Fixes #10418

(cherry picked from commit 27c2668)
@Kleidukos Kleidukos mentioned this pull request Oct 4, 2024
20 tasks
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@geekosaur
Copy link
Collaborator

Patches the component build ways for foreign library components.
@alt-romes
Copy link
Collaborator

I've applied an additional fix to build ways of foreign libraries to fix the CI error.
The PR for master is #10433

@wz1000
Copy link

wz1000 commented Oct 8, 2024

Can we merge this please? We need these patches in the 3.14 branch to allow the Cabal submodule in GHC to be updated to the branch.

@Kleidukos Kleidukos added merge me Tell Mergify Bot to merge merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days labels Oct 8, 2024
@mergify mergify bot merged commit f4d696d into 3.14 Oct 8, 2024
54 checks passed
@mergify mergify bot deleted the mergify/bp/3.14/pr-10419 branch October 8, 2024 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants