Add GHC bindist version 9.4.5 and 9.6.1 #1890
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
avdv
force-pushed
the
add-ghc-bindist-9.4.5-9.6.1
branch
5 times, most recently
from
8763a5b to
e381162
Compare
Determine if the current GHC bindist was build by Hadrian. We assume this is the case if the `config.mk.in` file exists in the root directory of the distribution; it was located in the `mk` subfolder in older bindists. We enable a relocatable build, ie. install, by setting `RelocatableBuild` to `YES` when invoking make. This simplifies the folder structure of the installation. Also, we no longer need to patch the bin scripts to make them relocatable.
avdv
force-pushed
the
add-ghc-bindist-9.4.5-9.6.1
branch
4 times, most recently
from
f6e1179 to
b85636a
Compare
ylecornec
approved these changes
May 10, 2023
haskell/ghc_bindist.bzl
Outdated
| }.get(version) | ||
| "9.4.5": ["@rules_haskell//haskell:assets/ghc_9_4_5_win.patch"], | ||
| "9.6.1": ["@rules_haskell//haskell:assets/ghc_9_6_1_win.patch"], | ||
| }.get(version, "".format()) |
There was a problem hiding this comment.
Is the default value "".format() here on purpose ?
There was a problem hiding this comment.
Good catch! I started to refactor this, but then decided against it. I'll fix it.
There is no `gcc.exe` anymore, but both of `cc.exe`.
avdv
force-pushed
the
add-ghc-bindist-9.4.5-9.6.1
branch
from
b85636a to
42ee20e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds GHC bindists for the latest stable GHC releases for 9.4 and 9.6. Fixes #1889
Notable changes are that starting with GHC 9.6.1 the bindist packages are packaged with Hadrian and thus are relocatable without patching the scripts in
bin.Note that the test-patches workflow has been run for these successfully, except for GHC 9.4.5 on Windows. See #1892 For the time being, until this gets resolved, I have excluded this version from the
test-ghc-patchesworkflow.