Skip to content

new arg to getOptions #618

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.

Sign up for GitHub

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

Jump to bottom
Merged
dylant-da merged 3 commits into from
Oct 15, 2025
Merged

new arg to getOptions #618

dylant-da merged 3 commits into from
Oct 15, 2025

Conversation

@shayne-fletcher
Copy link
Contributor

@shayne-fletcher shayne-fletcher commented Oct 9, 2025

fixes build breakage since 10/8/2025 due to 129ce32d3a4f2601f5c2d1bbaeeb2fbaf8dc9ef9

@shayne-fletcher shayne-fletcher requested a review from a team as a code owner October 9, 2025 11:54
@dylant-da
Copy link
Contributor

dylant-da commented Oct 14, 2025

Looks like we're getting a common error across this PR and the last, referring to HeapPrim.cmm

/Users/runner/work/ghc-lib/ghc-lib/ghc/./libraries/ghc-heap/cbits/HeapPrim.cmm: withBinaryFile: does not exist (No such file or directory)
ghc-lib-build-tool: Uncaught exception ghc-internal:GHC.Internal.Exception.ErrorCall:

@shayne-fletcher
Copy link
Contributor Author

shayne-fletcher commented Oct 14, 2025

rebase on 617 dylan. we just fixed this.

@shayne-fletcher
Copy link
Contributor Author

shayne-fletcher commented Oct 14, 2025

that is, rebase this on master

@shayne-fletcher
Copy link
Contributor Author

shayne-fletcher commented Oct 14, 2025

i rebased it for you. if you run CI now it should get past the ghc-9.14.1 errors

@shayne-fletcher shayne-fletcher mentioned this pull request Oct 14, 2025
Merged
@dylant-da dylant-da enabled auto-merge (squash) October 14, 2025 12:52
@dylant-da
Copy link
Contributor

dylant-da commented Oct 14, 2025

Cheers - admittedly I'm not very fluent with handling remote contributions in my local git yet, I took the time for that a few months ago but have since forgotten - I'll do that on #616.

@dylant-da dylant-da disabled auto-merge October 14, 2025 16:21
@dylant-da
Copy link
Contributor

dylant-da commented Oct 14, 2025 •
edited
Loading

Because initSourceErrorContext was only added in GHC 9.16, building 9.14 on that if block breaks - I'm adding a small if around the initSourceErrorContext to see if that fixes it on CI, seeing as it fixes it locally.

@dylant-da dylant-da merged commit c2699ec into digital-asset:master Oct 15, 2025
46 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Oct 15, 2025
@dylant-da
Copy link
Contributor

dylant-da commented Oct 15, 2025

I've merged this to get us unblocked, I'm not sure how much you like the nested CPP #if statements - we can fix this in a future cleanup PR.

@shayne-fletcher shayne-fletcher deleted the source-error-context branch October 15, 2025 13:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@dylant-da dylant-da dylant-da approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@shayne-fletcher @dylant-da