diff options
author | Ben Gamari <ben@smart-cactus.org> | 2020-05-24 21:28:22 -0400 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2020-05-24 22:37:53 -0400 |
commit | f1acf1199e4094e16a3d2fbfb6b8129bf471b658 (patch) | |
tree | 1259e72a644955b5f574a598aed582a6544eb460 | |
parent | cd339ef0e8ce940902df79ed1d93b3af50ea6f77 (diff) | |
download | haskell-wip/T18131.tar.gz |
hadrian: Don't track GHC's verbosity argumentwip/T18131
Teach hadrian to ignore GHC's -v argument in its recompilation check,
thus fixing #18131.
-rw-r--r-- | hadrian/src/Target.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hadrian/src/Target.hs b/hadrian/src/Target.hs index 30c8d98d14..f3de9036cd 100644 --- a/hadrian/src/Target.hs +++ b/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" |