diff options
| author | Hécate Moonlight <hecate+gitlab@glitchbra.in> | 2021-05-01 09:33:41 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-05-03 19:51:22 -0400 |
| commit | 0680e9a5ce29523fca43b62a8edc59b0d0690d6a (patch) | |
| tree | 364f76b49f900dcf6e7f9be4f4292c32368c6ae2 | |
| parent | 5126a07e0c095c8756bf96196d2c7d8bb9416142 (diff) | |
| download | haskell-0680e9a5ce29523fca43b62a8edc59b0d0690d6a.tar.gz | |
Disable HLint colours
closes #19776
| -rw-r--r-- | hadrian/src/Rules/Lint.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hadrian/src/Rules/Lint.hs b/hadrian/src/Rules/Lint.hs index f02a63b6b0..ad278b60fb 100644 --- a/hadrian/src/Rules/Lint.hs +++ b/hadrian/src/Rules/Lint.hs @@ -13,7 +13,7 @@ lintRules = do lint :: Action () -> Action () lint lintAction = do - isHlintPresent <- isJust <$> (liftIO $ findExecutable "hlint") + isHlintPresent <- isJust <$> liftIO (findExecutable "hlint") if isHlintPresent then do putBuild "| Running the linter…" @@ -30,9 +30,10 @@ runHLint includeDirs defines dir = do threads <- shakeThreads <$> getShakeOptions hostArch <- (<> "_HOST_ARCH") <$> setting HostArch let hlintYaml = dir </> ".hlint.yaml" - defines' = [hostArch] ++ defines + defines' = hostArch : defines cmdLine = unwords $ [ "hlint" + , "--colour=never" , "-j" <> show threads ] ++ map ("--cpp-define=" <>) defines' ++ |