Skip to content

Update to GHC 9.6#499

Merged
d-xo merged 35 commits intomainfrom
ghc-9.6-v2
Jul 25, 2024
Merged

Update to GHC 9.6#499
d-xo merged 35 commits intomainfrom
ghc-9.6-v2

Conversation

@blishko
Copy link
Collaborator

@blishko blishko commented Jul 9, 2024

Description

This finishes the work started in #471.

Checklist

  • tested locally
  • added automated tests
  • updated the docs
  • updated the changelog

arcz and others added 19 commits April 22, 2024 17:57
On arm Mac, the GHC is trying to locate libc++, but during that it also
searches for c++ (without the lib prefix), which is an alias for a clang
executable. It tries to load an executable as a static library which
results in an error.

I have no idea why these changes work, but they seem to work.
Foundry does not depend on DS tests anymore, they provide their own
cheatcodes directly in their VM now, so that the `lib` directory no
longer exists.
This shell only sets up the test dependencies, but keeps the Haskell
environment setup from the system.
This is a temporary workaround until the nix/ghc issue on MacOS is fixed
upstream.
@msooseth
Copy link
Collaborator

Let me know when this is ready for review! :) I'd be happy to review & merge.

@d-xo d-xo marked this pull request as ready for review July 24, 2024 11:29
hevm.cabal Outdated
Comment on lines 114 to 116
if os(linux)
build-depends: system-cxx-std-lib
elif !os(darwin)
extra-libraries: stdc++
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we may be able to simplify this now and just have build-depends: system-cxx-std-lib for all platforms, plus the special darwin flags just in one place.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@elopez , do you want to try it?
There are already 4 people contributing to this PR, why not make it 5 😄

Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Your commits are included. First, there was some problem in CI, but after restarting a job, everything is green now!

@blishko
Copy link
Collaborator Author

blishko commented Jul 24, 2024

@d-xo, I guess we can merge now, WDYT?

@elopez
Copy link
Collaborator

elopez commented Jul 24, 2024

@blishko there's one last issue remaining, the redistributable files produced by nix contain references to the nix store due to how c++ / c++abi is now split. I'm hoping this fixes it and prevents the issue from going unnoticed again elopez@6575b73

Edit: it seems to work fine locally. The build CI uploads "nixful" binaries but that's because it doesn't use #redistributable. I expect the release CI to work fine with that patch.

@d-xo
Copy link
Collaborator

d-xo commented Jul 25, 2024

@elopez thats not a regression and I think it can be fixed in a separate pr. Let's merge this now. thanks for the work everyone,I think we have commits from almost every active hevm contributor on this branch ❤️

@d-xo d-xo merged commit 662d8f9 into main Jul 25, 2024
@d-xo d-xo deleted the ghc-9.6-v2 branch July 25, 2024 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants