[Git][ghc/ghc][master] hadrian: Don't track GHC's verbosity argument

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
8f021b8c by Ben Gamari at 2020-05-28T16:26:34-04:00
hadrian: Don't track GHC's verbosity argument

Teach hadrian to ignore GHC's -v argument in its recompilation check,
thus fixing #18131.

- - - - -


1 changed file:

- hadrian/src/Target.hs


Changes:

=====================================
hadrian/src/Target.hs
=====================================
@@ -20,7 +20,9 @@ type Target = H.Target Context Builder
 -- 'True' only if the argument needs to be tracked.
 trackArgument :: Target -> String -> Bool
 trackArgument target arg = case builder target of
-    (Make _) -> not $ threadArg arg
-    _        -> True
+    Make _    -> not $ threadArg arg
+    Ghc _ _   -> not $ verbosityArg arg
+    _         -> True
   where
     threadArg s = dropWhileEnd isDigit s `elem` ["-j", "MAKEFLAGS=-j", "THREADS="]
+    verbosityArg s = dropWhileEnd isDigit s == "-v"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f021b8c474f328441982c90c6a12f716b5607eb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8f021b8c474f328441982c90c6a12f716b5607eb
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/20200528/762563d9/attachment.html>