diff options
| author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-03-30 23:15:48 +0200 |
|---|---|---|
| committer | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-03-31 05:48:46 -0400 |
| commit | b314e5b648e48ac40f1b20b713920c7ea1c31304 (patch) | |
| tree | 6c1083af429f2d29a17100b2f3a55d0f589dc852 | |
| parent | f024b6e385bd1448968b7bf20de05f655c815bae (diff) | |
| download | haskell-wip/andreask/hadrian_no_colour.tar.gz | |
Make hadrian pass on the no-colour setting to GHC.wip/andreask/hadrian_no_colour
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 2549a63e39..0083a4e8a1 100644 --- a/hadrian/src/Settings/Builders/Ghc.hs +++ b/hadrian/src/Settings/Builders/Ghc.hs @@ -31,9 +31,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" |