summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-10-09 20:16:29 -0400
committerBen Gamari <ben@smart-cactus.org>2021-10-09 20:18:33 -0400
commitf71726878328712d59c411ddc5f953fef8845b1e (patch)
tree9b0585ce0584a398ea703ccece9cff974dffae8c
parent01f5324f8eaa2ce28d617922bc4d3b680ad4fc38 (diff)
downloadhaskell-wip/hadrian-cabal-verbose.tar.gz
hadrian: Include Cabal flags in verbose configure outputwip/hadrian-cabal-verbose
-rw-r--r--hadrian/src/Hadrian/Haskell/Cabal/Parse.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
index d34951a5ef..099d5dc96f 100644
--- a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+++ b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
@@ -152,12 +152,12 @@ configurePackage context@Context {..} = do
trackArgsHash (target context (Cabal Flags stage) [] [])
trackArgsHash (target context (Cabal Setup stage) [] [])
verbosity <- getVerbosity
- when (verbosity >= Verbose) $
- putProgressInfo $ "| Package " ++ quote (pkgName package) ++ " configuration flags: " ++ unwords argList
let v = if verbosity >= Diagnostic then "-v3" else "-v0"
+ argList' = argList ++ ["--flags=" ++ unwords flagList, v]
+ when (verbosity >= Verbose) $
+ putProgressInfo $ "| Package " ++ quote (pkgName package) ++ " configuration flags: " ++ unwords argList'
traced "cabal-configure" $
- C.defaultMainWithHooksNoReadArgs hooks gpd
- (argList ++ ["--flags=" ++ unwords flagList, v])
+ C.defaultMainWithHooksNoReadArgs hooks gpd argList'
dir <- Context.buildPath context
files <- liftIO $ getDirectoryFilesIO "." [ dir -/- "include" -/- "**"