Commit 7ece59b3 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

GHC issue #8825 was fixed in 7.8.4.

parent c5f51c26
...@@ -54,7 +54,8 @@ import Distribution.Simple.Utils ...@@ -54,7 +54,8 @@ import Distribution.Simple.Utils
import Distribution.Compat.Exception import Distribution.Compat.Exception
( catchIO ) ( catchIO )
import Distribution.Version import Distribution.Version
( Version(..), withinRange, withinVersion ) ( Version(..), withinRange, earlierVersion, laterVersion
, intersectVersionRanges )
import Data.Char import Data.Char
( isDigit ) ( isDigit )
...@@ -107,14 +108,17 @@ ghcProgram = (simpleProgram "ghc") { ...@@ -107,14 +108,17 @@ ghcProgram = (simpleProgram "ghc") {
-- Workaround for https://ghc.haskell.org/trac/ghc/ticket/8825 -- Workaround for https://ghc.haskell.org/trac/ghc/ticket/8825
-- (spurious warning on non-english locales) -- (spurious warning on non-english locales)
-- Only GHC 7.8.* seems to be affected.
programPostConf = \_verbosity ghcProg -> programPostConf = \_verbosity ghcProg ->
do let ghcProg' = ghcProg { do let ghcProg' = ghcProg {
programOverrideEnv = ("LANGUAGE", Just "en") programOverrideEnv = ("LANGUAGE", Just "en")
: programOverrideEnv ghcProg : programOverrideEnv ghcProg
} }
-- Only the 7.8 branch seems to be affected. Fixed in 7.8.4.
affectedVersionRange = intersectVersionRanges
(laterVersion $ Version [7,8,0] [])
(earlierVersion $ Version [7,8,4] [])
return $ maybe ghcProg return $ maybe ghcProg
(\v -> if withinRange v (withinVersion $ Version [7,8] []) (\v -> if withinRange v affectedVersionRange
then ghcProg' else ghcProg) then ghcProg' else ghcProg)
(programVersion ghcProg) (programVersion ghcProg)
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment