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.

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

Fix #5973 stack ghci makes use of Cabal file default-language keys #5981

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Fix #5973 stack ghci makes use of Cabal file default-language keys #5981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Major changes:

Behavior changes:

* `stack ghci` and `stack repl` now take into account the values of
`default-language` keys in Cabal files, like they take into account the values
of `default-extensions` keys.

Other enhancements:

Bug fixes:
Expand Down
4 changes: 3 additions & 1 deletion src/Stack/Package.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,9 @@ generateBuildInfoOpts BioInput {..} =
| Dependency name _ _ <- targetBuildDepends biBuildInfo -- TODO: cabal 3 introduced multiple public libraries in a single dependency
, name `notElem` biOmitPackages]
PerCompilerFlavor ghcOpts _ = options biBuildInfo
extOpts = map (("-X" ++) . display) (usedExtensions biBuildInfo)
extOpts =
map (("-X" ++) . display) (allLanguages biBuildInfo)
<> map (("-X" ++) . display) (usedExtensions biBuildInfo)
srcOpts =
map (("-i" <>) . toFilePathNoTrailingSep)
(concat
Expand Down