Modularise configure step

This commit modularises the configure phase (i.e. the function Distribution.Simple.Configure.configure). The aim of this change is to make explicit the control flow of the function: it starts off with a package-wide phase, and then componentwise configuration.
haskell · Nov 27, 2023 · 64c9e21 · 64c9e21
1 parent df3f7a6
commit 64c9e21
Show file tree

Hide file tree

Showing 5 changed files with 650 additions and 473 deletions.
diff --git a/Cabal/src/Distribution/Backpack/Configure.hs b/Cabal/src/Distribution/Backpack/Configure.hs
@@ -85,7 +85,7 @@ configureComponentLocalBuildInfos
   cid_flag
   pkg_descr
   (prePkgDeps, promisedPkgDeps)
-  flagAssignment
+  flags
   instantiate_with
   installedPackageSet
   comp = do
@@ -123,7 +123,7 @@ configureComponentLocalBuildInfos
     graph1 <-
       toConfiguredComponents
         use_external_internal_deps
-        flagAssignment
+        flags
         deterministic
         ipid_flag
         cid_flag

diff --git a/Cabal/src/Distribution/Simple/BuildTarget.hs b/Cabal/src/Distribution/Simple/BuildTarget.hs
@@ -1046,11 +1046,11 @@ checkBuildTargets _ pkg_descr lbi [] =
 checkBuildTargets
   verbosity
   pkg_descr
-  lbi@(LocalBuildInfo{componentEnabledSpec})
+  lbi@(LocalBuildInfo{componentEnabledSpec = enabledComps})
   targets = do
     let (enabled, disabled) =
           partitionEithers
-            [ case componentDisabledReason componentEnabledSpec comp of
+            [ case componentDisabledReason enabledComps comp of
               Nothing -> Left target'
               Just reason -> Right (cname, reason)
             | target <- targets