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 #10419

Merged
merged 1 commit into from
Oct 4, 2024

Conversation

mpickering
Copy link
Collaborator

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

changelog.d/i10418 Show resolved Hide resolved
@geekosaur
Copy link
Collaborator

Backportable to 3.14 but not 3.12.

Copy link
Collaborator

@alt-romes alt-romes left a comment

Choose a reason for hiding this comment

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

Great find. Thanks for the fix.

@mpickering mpickering added the merge me Tell Mergify Bot to merge label Oct 4, 2024
@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Oct 4, 2024
@geekosaur
Copy link
Collaborator

Does this need to be expedited?

@wz1000
Copy link
Contributor

wz1000 commented Oct 4, 2024

Yes, this needs to be backported to the 3.14 branch too.

@wz1000 wz1000 mentioned this pull request Oct 4, 2024
20 tasks
@geekosaur geekosaur added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Oct 4, 2024
@geekosaur
Copy link
Collaborator

@mergify backport 3.14

Copy link
Contributor

mergify bot commented Oct 4, 2024

backport 3.14

✅ Backports have been created

…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 haskell#10418
@geekosaur
Copy link
Collaborator

Figured that. It's embarked now.

@mergify mergify bot merged commit ad439ea into haskell:master Oct 4, 2024
42 checks passed
@Kleidukos
Copy link
Member

@Mergifyio backport 3.12

Copy link
Contributor

mergify bot commented Oct 4, 2024

backport 3.12

✅ Backports have been created

@geekosaur
Copy link
Collaborator

Repeating here: this can't be backported to 3.12 because it's a modification to #9900, which changed the Cabal spec version to 3.13.

@Mikolaj
Copy link
Member

Mikolaj commented Oct 4, 2024

Yes, this needs to be backported to the 3.14 branch too.

@wz1000: just to clarify, in our cabal maintainers jargon "expedited" means "merged without waiting the normal 2 days for all interested devs to find time to review and discuss". I believe this patch did not need to be expedited and there was probably a miscommunication of expedited vs. backported.

@geekosaur
Copy link
Collaborator

I understood it to be "yes, and…". I already knew it was destined for backporting since it's needed for 9.12.1.

mergify bot added a commit that referenced this pull request Oct 8, 2024
Cabal: Take into account compilerBuildWay when computing final library ways (backport #10419)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Executable modules are built in too many ways
6 participants