Skip to content
Snippets Groups Projects
Commit 3c09f636 authored by Andreas Klebinger's avatar Andreas Klebinger Committed by Marge Bot
Browse files

Make hadrian pass on the no-colour setting to GHC.

Fixes #17983.
parent 7b217179
No related merge requests found
Pipeline #17477 failed
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment