diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2021-03-02 09:19:29 +0100 |
|---|---|---|
| committer | Sylvain Henry <sylvain@haskus.fr> | 2021-03-02 09:19:29 +0100 |
| commit | 47583a77d136c1e67b1779d58fc453b68700c01c (patch) | |
| tree | e439de97ac36c6b2bf2df7f1fbb7106de87cc216 | |
| parent | f512f9e232329c3c6c5a809d82216cc90a3a3ec7 (diff) | |
| download | haskell-wip/hsyl20/windows.tar.gz | |
WIP: fix Hadrian non English localewip/hsyl20/windows
| -rw-r--r-- | hadrian/src/Hadrian/Builder/Ar.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hadrian/src/Hadrian/Builder/Ar.hs b/hadrian/src/Hadrian/Builder/Ar.hs index ad74653db0..d43bc0be00 100644 --- a/hadrian/src/Hadrian/Builder/Ar.hs +++ b/hadrian/src/Hadrian/Builder/Ar.hs @@ -50,8 +50,9 @@ arFlagsCount = 2 runAr :: FilePath -> [String] -> Action () runAr arPath argList = withTempFile $ \tmp -> do writeFile' tmp $ unwords fileArgs - cmd [arPath] flagArgs ('@' : tmp) + cmd_ env [arPath] flagArgs ('@' : tmp) where + env = Env [("LANG","C.utf8")] -- avoid encoding issue when reading stdout. See # flagArgs = take arFlagsCount argList fileArgs = drop arFlagsCount argList @@ -62,7 +63,8 @@ runAr arPath argList = withTempFile $ \tmp -> do runArWithoutTempFile :: FilePath -> [String] -> Action () runArWithoutTempFile arPath argList = forM_ (chunksOfSize cmdLineLengthLimit fileArgs) $ \argsChunk -> - unit . cmd [arPath] $ flagArgs ++ argsChunk + cmd_ env [arPath] flagArgs argsChunk where + env = Env [("LANG","C.utf8")] -- avoid encoding issue when reading stdout. See # flagArgs = take arFlagsCount argList fileArgs = drop arFlagsCount argList |