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

Bump stackage snapshot to lts-19.33 #17795

Merged
merged 7 commits into from Nov 13, 2023
Merged

Bump stackage snapshot to lts-19.33 #17795

merged 7 commits into from Nov 13, 2023

Conversation

akrmn
Copy link
Contributor

@akrmn akrmn commented Nov 9, 2023

No description provided.

@@ -471,7 +471,7 @@ locateCppPath = do
-- the resources directory because the target produces a tarball which
-- has the executable directly under the top directory.
-- See @bazel_tools/packaging/packaging.bzl@.
, runfilesPathPrefix = "stackage" </> "hpp-0.6.4" </> "_install" </> "bin"
, runfilesPathPrefix = "stackage" </> "hpp-0.6.5" </> "_install" </> "bin"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

So, this was the root cause of the missing field Settings.sPgm_P errors: the version bump meant the hpp bin moved, so we couldn't locate it, so adjustDynFlags couldn't set sPgm_P and sOpt_P, so the fields were indeed missing so GHC crashed in doCpp.

This is not the final fix since we want to prevent this from happening again. I want to remove the hardcoded version of hpp here - using a copy instead of the @stackage/hpp bin directly should work. I also want to make this crash with a clear error if the file is missing instead of returning a Nothing that will silently give us a partial Settings.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@akrmn akrmn changed the title [DoNotMerge] Attempt to bump stackage snapshot to lts-19.33 Bump stackage snapshot to lts-19.33 Nov 13, 2023
@akrmn akrmn marked this pull request as ready for review November 13, 2023 16:39
@akrmn akrmn requested a review from a team November 13, 2023 17:12
Copy link
Contributor

@paulbrauner-da paulbrauner-da left a comment

Choose a reason for hiding this comment

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

Thank you!

-- but comes from the stackage target, so the prefix is different
-- from that of the dist target.
, runfilesPathPrefix = mainWorkspace </> "compiler" </> "damlc"
-- //compiler/damlc:hpp-copy
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm guessing this means "we're getting hpp from this target" but it wasn't clear upon first read. Maybe elaborate a bit. (I realize this is just a rephrasing of the existing comment.)

@akrmn akrmn merged commit e67fd30 into main Nov 13, 2023
18 checks passed
@akrmn akrmn deleted the akrmn/bump-stack-snapshot branch November 13, 2023 18:42
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.

None yet

2 participants