diff options
| author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-03-30 23:15:48 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-01 15:03:59 -0400 |
| commit | 3c09f636a459f50119bfbb5bf798b9a9e19eb464 (patch) | |
| tree | e641a06433c125158e96c2544bf8dee135ecaf0a | |
| parent | 7b21717907a741b56513f5e1fa1ebceecf971613 (diff) | |
| download | haskell-3c09f636a459f50119bfbb5bf798b9a9e19eb464.tar.gz | |
Make hadrian pass on the no-colour setting to GHC.
Fixes #17983.
| -rw-r--r-- | hadrian/src/Settings/Builders/Ghc.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs index 17b0a4a359..58f7132d9b 100644 --- a/hadrian/src/Settings/Builders/Ghc.hs +++ b/hadrian/src/Settings/Builders/Ghc.hs @@ -29,9 +29,12 @@ toolArgs = do compileAndLinkHs :: Args compileAndLinkHs = (builder (Ghc CompileHs) ||^ builder (Ghc LinkHs)) ? do ways <- getLibraryWays + useColor <- shakeColor <$> expr getShakeOptions let hasVanilla = elem vanilla ways hasDynamic = elem dynamic ways mconcat [ arg "-Wall" + , not useColor ? builder (Ghc CompileHs) ? + arg "-fdiagnostics-color=never" , (hasVanilla && hasDynamic) ? builder (Ghc CompileHs) ? platformSupportsSharedLibs ? way vanilla ? arg "-dynamic-too" |