[Git][ghc/ghc][wip/andreask/hadrian_no_colour] Make hadrian pass on the no-colour setting to GHC.

[Andreas Klebinger]

Andreas Klebinger pushed to branch wip/andreask/hadrian_no_colour at Glasgow Haskell Compiler / GHC


Commits:
16c45686 by Andreas Klebinger at 2020-03-30T23:20:10+02:00
Make hadrian pass on the no-colour setting to GHC.

Fixes #17983.

- - - - -


1 changed file:

- hadrian/src/Settings/Builders/Ghc.hs


Changes:

=====================================
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"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/16c456862bbba59310c17574ee10cb9b5853c133

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/16c456862bbba59310c17574ee10cb9b5853c133
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200330/8afe2bc4/attachment.html>