hadrian: Track hash of Cabal Setup builder arguments

Lest we fail to rebuild when they change. Fixes #17611.

1 files changed, 6 insertions, 1 deletions

diff --git a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
index af7966c0ef..12e654cee3 100644
--- a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+++ b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
@@ -43,6 +43,7 @@ import Hadrian.Expression
 import Hadrian.Haskell.Cabal
 import Hadrian.Haskell.Cabal.Type
 import Hadrian.Oracles.Cabal
+import Hadrian.Oracles.ArgsHash
 import Hadrian.Target
 
 import Base
@@ -137,11 +138,15 @@ configurePackage context@Context {..} = do
             pure $ C.simpleUserHooks { C.postConf = \_ _ _ _ -> return () }
           | otherwise -> pure C.simpleUserHooks
 
-    -- Compute the list of flags, and the Cabal configurartion arguments
+    -- Compute the list of flags, and the Cabal configuration arguments
     flavourArgs <- args <$> flavour
     flagList    <- interpret (target context (Cabal Flags stage) [] []) flavourArgs
     argList     <- interpret (target context (Cabal Setup stage) [] []) flavourArgs
+    trackArgsHash (target context (Cabal Flags stage) [] [])
+    trackArgsHash (target context (Cabal Setup stage) [] [])
     verbosity   <- getVerbosity
+    when (verbosity >= Loud) $
+        putProgressInfo $ "| Package " ++ quote (pkgName package) ++ " configuration flags: " ++ unwords argList
     let v = if verbosity >= Loud then "-v3" else "-v0"
     traced "cabal-configure" $
         C.defaultMainWithHooksNoReadArgs hooks gpd