@@ -1693,7 +1693,6 @@ elaborateInstallPlan
16931693 let whyNotPerComp = why_not_per_component src_comps
16941694 case NE. nonEmpty whyNotPerComp of
16951695 Nothing -> do
1696- elaborationWarnings
16971696 return comps
16981697 Just notPerCompReasons -> do
16991698 checkPerPackageOk comps notPerCompReasons
@@ -1766,7 +1765,7 @@ elaborateInstallPlan
17661765 <+> fsep (punctuate comma $ map (text . whyNotPerComponent) $ toList reasons)
17671766 -- TODO: Maybe exclude Backpack too
17681767
1769- ( elab0, elaborationWarnings) = elaborateSolverToCommon spkg
1768+ elab0 = elaborateSolverToCommon spkg
17701769 pkgid = elabPkgSourceId elab0
17711770 pd = elabPkgDescription elab0
17721771
@@ -2078,11 +2077,17 @@ elaborateInstallPlan
20782077 -- Knot tying: the final elab includes the
20792078 -- pkgInstalledId, which is calculated by hashing many
20802079 -- of the other fields of the elaboratedPackage.
2081- elaborationWarnings
20822080 return elab
20832081 where
2084- (elab0@ ElaboratedConfiguredPackage {.. }, elaborationWarnings) =
2085- elaborateSolverToCommon pkg
2082+ elab =
2083+ elab1
2084+ { elabInstallDirs =
2085+ computeInstallDirs
2086+ storeDirLayout
2087+ defaultInstallDirs
2088+ elaboratedSharedConfig
2089+ elab1
2090+ }
20862091
20872092 elab1 =
20882093 elab0
@@ -2093,15 +2098,9 @@ elaborateInstallPlan
20932098 , elabModuleShape = modShape
20942099 }
20952100
2096- elab =
2097- elab1
2098- { elabInstallDirs =
2099- computeInstallDirs
2100- storeDirLayout
2101- defaultInstallDirs
2102- elaboratedSharedConfig
2103- elab1
2104- }
2101+ elab0@ ElaboratedConfiguredPackage {.. } =
2102+ elaborateSolverToCommon pkg
2103+
21052104
21062105 modShape = case find (matchElabPkg (== (CLibName LMainLibName ))) comps of
21072106 Nothing -> emptyModuleShape
@@ -2167,7 +2166,7 @@ elaborateInstallPlan
21672166
21682167 elaborateSolverToCommon
21692168 :: SolverPackage UnresolvedPkgLoc
2170- -> ( ElaboratedConfiguredPackage , LogProgress () )
2169+ -> ElaboratedConfiguredPackage
21712170 elaborateSolverToCommon
21722171 pkg@ ( SolverPackage
21732172 qpn
@@ -2177,7 +2176,7 @@ elaborateInstallPlan
21772176 deps0
21782177 _exe_deps0
21792178 ) =
2180- ( elaboratedPackage, wayWarnings pkgid)
2179+ elaboratedPackage
21812180 where
21822181 elaboratedPackage = ElaboratedConfiguredPackage {.. }
21832182
0 commit comments