Fix #404 Accommodate ${pkgroot} and tolerate GHC errors on Windows #405
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
…Windows
CPP is used to tailor for Windows and GHC >= 9.0. In that case, ${pkgroot} is not expanded and the bogus prefix is stripped.
Otherwise, ${pkgroot} is expanded. For compatibility with GHC < 9.0, $topdir is still stripped, if present.
mpickering
reviewed
Aug 5, 2024
| -- haddock-html: ${pkgroot}/../doc/html/libraries/base-4.18.0.0 | ||
| -- So, a unique approach is taken to `readGhcPkg` in that case. It assumes that | ||
| -- the `*.conf` files have not been manually corrected. | ||
| #if defined(mingw32_HOST_OS) && __GLASGOW_HASKELL__>=901 |
There was a problem hiding this comment.
This CPP should have an upper bound, it is fixed in 9.10.1.
There was a problem hiding this comment.
I'm not sure it's a great idea to bake this logic about some broken bindists into hoogle, someone could build their own bindist which doesn't have this bug and it would be broken.
mpickering
reviewed
Aug 5, 2024
| #else | ||
| -- From GHC 9.0.1, the `haddock-html` field in `*.conf` files for GHC boot | ||
| -- libraries has used `${pkgroot}`, which can be expanded in the output. | ||
| let ghcPkgArgs = ["dump", "--expand-pkgroot"] |
There was a problem hiding this comment.
Using --expand-pkgroot is a good fix.
|
I can confirm this fixes #420 on ghc-9.4.8 (gentoo linux) |
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.
CPP is used (sorry) to tailor for Windows and GHC >= 9.0. In that case, ${pkgroot} is not expanded and the bogus prefix is stripped.
Otherwise, ${pkgroot} is expanded. For compatibility with GHC < 9.0, $topdir is still stripped, if present.
I confirm I am licensing my contribution under all licenses that apply to this project (see LICENSE) and that I have no patents covering my contribution.