[commit: ghc] wip/ghc710-aix: Workaround broken latin1 iconv on AIX (0cea7e3)
git at git.haskell.org
git at git.haskell.org
Tue Nov 17 22:29:07 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/ghc710-aix
Link : http://ghc.haskell.org/trac/ghc/changeset/0cea7e326140094eeaa997377cf5c53afb949bd8/ghc
>---------------------------------------------------------------
commit 0cea7e326140094eeaa997377cf5c53afb949bd8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Mon Nov 16 09:14:42 2015 +0100
Workaround broken latin1 iconv on AIX
>---------------------------------------------------------------
0cea7e326140094eeaa997377cf5c53afb949bd8
libraries/base/GHC/IO/Encoding.hs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libraries/base/GHC/IO/Encoding.hs b/libraries/base/GHC/IO/Encoding.hs
index a690717..6dfc9d0 100644
--- a/libraries/base/GHC/IO/Encoding.hs
+++ b/libraries/base/GHC/IO/Encoding.hs
@@ -237,6 +237,8 @@ mkTextEncoding e = case mb_coding_failure_mode of
mkTextEncoding' :: CodingFailureMode -> String -> IO TextEncoding
mkTextEncoding' cfm enc =
case [toUpper c | c <- enc, c /= '-'] of
+ -- ISO8859-1 we can handle ourself
+ "ISO88591" -> return $ Latin1.mkLatin1 cfm
-- UTF-8 and friends we can handle ourselves
"UTF8" -> return $ UTF8.mkUTF8 cfm
"UTF16" -> return $ UTF16.mkUTF16 cfm
More information about the ghc-commits
mailing list