Skip to content

Revert workaround to filter JavaScriptFFI out on GHC versions where G… #8979

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

Merged
merged 6 commits into from
Jun 2, 2023
Merged

Revert workaround to filter JavaScriptFFI out on GHC versions where G… #8979

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
730dd56
Revert workaround to filter JavaScriptFFI out on GHC versions where G…
JoshMeredith May 29, 2023
7b593d5
Merge branch 'master' into wip/filterJsFFI
JoshMeredith May 30, 2023
331f2b1
Lint
JoshMeredith May 30, 2023
13bb879
Lint
JoshMeredith May 30, 2023
0a591f8
Update version range to reflect the fix being included in GHC 9.8
JoshMeredith May 30, 2023
856bd28
Merge branch 'master' into wip/filterJsFFI
mergify[bot] Jun 1, 2023
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
3 changes: 2 additions & 1 deletion Cabal/src/Distribution/Simple/GHC.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,10 @@ configure verbosity hcPath hcPkgPath conf0 = do

ghcInfo <- Internal.getGhcInfo verbosity implInfo ghcProg
let ghcInfoMap = Map.fromList ghcInfo
filterJS = if ghcVersion < mkVersion [9, 8] then filterExt JavaScriptFFI else id
extensions =
-- workaround https://gitlab.haskell.org/ghc/ghc/-/issues/11214
filterExt JavaScriptFFI $
filterJS $
-- see 'filterExtTH' comment below
filterExtTH $
extensions0
Expand Down