summaryrefslogtreecommitdiff
path: root/hadrian
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-10-09 20:16:29 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-10-10 17:55:10 -0400
commit245ab1662edd91a82c17de110c79450fec3f7b82 (patch)
treeb48546a408d8681832e491c0146a798ca9c0277e /hadrian
parenta356bd5673301e0d17088d278100cca94db8664f (diff)
downloadhaskell-245ab1662edd91a82c17de110c79450fec3f7b82.tar.gz
hadrian: Include Cabal flags in verbose configure output
Diffstat (limited to 'hadrian')
-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" -/- "**"