Skip to content

[Backport staging-24.05] haskellPackages: Pass ghc-options in generic-builder when cross-compiling#321255

Merged
vcunat merged 1 commit intostaging-24.05from
backport-317181-to-staging-24.05
Jul 27, 2024
Merged

[Backport staging-24.05] haskellPackages: Pass ghc-options in generic-builder when cross-compiling#321255
vcunat merged 1 commit intostaging-24.05from
backport-317181-to-staging-24.05

Conversation

@github-actions
Copy link
Contributor

Bot-based backport to staging-24.05, triggered by a label in #317181.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

…ling

The following sequence of operations loses ghc-options:
  Setup.hs configure --ghc-options
  Setup.hs build --with-ghc=...

This is described in [1].

The fix is simple: Don't pass --with-ghc in the build phase. The values
are taken from the configure step anyway. This seems to have been
introduced all the way back in 64ec4dd
about 8 years ago for unknown reasons.

Resolves #286285

[1]: haskell/cabal#10069

(cherry picked from commit 5dbf665)
@sternenseemann
Copy link
Member

I'm a little concerned here since we don't test as much cross stuff in our Hydra jobsets. Maybe we should wait a little with this?

@wolfgangwalther
Copy link
Contributor

I wondered the same, test coverage is certainly not high. Although.. I'd assume the risk to be rather low. The crossCabalFlags are so basic and essential to cross-compiling that they should have made a problem already in the limited tests we did?

@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 20, 2024
@vcunat vcunat merged commit 6b7717b into staging-24.05 Jul 27, 2024
@bjornfor bjornfor deleted the backport-317181-to-staging-24.05 branch August 1, 2024 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants