Skip to content

Fix path to Hadrian build script for GHC source builds #5529

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
snoyberg merged 4 commits into from
May 13, 2021
Merged

Fix path to Hadrian build script for GHC source builds #5529

snoyberg merged 4 commits into from
May 13, 2021

Conversation

@fwcd
Copy link
Contributor

@fwcd fwcd commented Apr 26, 2021 •
edited
Loading

The build script has been renamed from build.stack.sh to build-stack (and build-stack.bat on Windows).

Fixes #5528.

  • Any changes that could be relevant to users have been recorded in the ChangeLog.md (no user-facing changes, so not necessary)
  • The documentation has been updated, if necessary.

The fix has been tested manually with recent GHC versions.

@fwcd fwcd mentioned this pull request Apr 26, 2021
Draft
@snoyberg
Copy link
Contributor

snoyberg commented May 13, 2021

My only concern is that this seems like it will break old builds with old versions of GHC. I'm not sure if we really care about that. But it may be worthwhile to include logic to check for both versions of the file and then use the one that exists. Thoughts?

@fwcd
Copy link
Contributor Author

fwcd commented May 13, 2021

Sure, I've updated the logic to include both the new and the old path and choose the first one that exists.

@snoyberg
Copy link
Contributor

snoyberg commented May 13, 2021

Any changes that could be relevant to users have been recorded in the ChangeLog.md (no user-facing changes, so not necessary)

It would actually still be nice to include this in the changelog so that, if someone is hitting this issue on an older version, looking at the changelog will let them know it's fixed.

snoyberg
snoyberg reviewed May 13, 2021
View reviewed changes
fwcd and others added 4 commits May 13, 2021 17:50
@fwcd
Update path to Hadrian build script
0d76fc6 
This has been renamed from `build.stack.sh` to `build-stack` (and
`build-stack.bat` on Windows).

Fixes #5528.
@fwcd
Include old Hadrian paths for compatibility
3850d89 
...and select the one that exists.
@fwcd
Mention #5528 bugfix in changelog
fbb8174
@fwcd @snoyberg
Improve error handling for missing Hadrian path
e93a03a 
Co-authored-by: Michael Snoyman <[email protected]>
@fwcd
Copy link
Contributor Author

fwcd commented May 13, 2021

The branch is now rebased on master and includes the updated changelog and the suggestion.

@snoyberg snoyberg merged commit 9c69ea3 into commercialhaskell:master May 13, 2021
@snoyberg
Copy link
Contributor

snoyberg commented May 13, 2021

Thanks!

@fwcd fwcd deleted the fix-hadrian-script-path branch August 3, 2021 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@snoyberg snoyberg snoyberg 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.

Stack invokes the wrong Hadrian build script when building GHC from source

2 participants

@fwcd @snoyberg