File tree Expand file tree Collapse file tree 1 file changed +10
-3
lines changed
cabal-install/src/Distribution/Client Expand file tree Collapse file tree 1 file changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -216,12 +216,19 @@ configure
216216 OneComponentRequestedSpec {} -> True
217217 ComponentRequestedSpec {} -> False
218218 externalPkgDeps <- Cabal. configureDependencies verbosity useExternalInternalDeps pkg_info pkg_descr compRequested
219- lbi <- Cabal. configureComponents lbc2 pbd3 installedPkgs promisedDeps externalPkgDeps
219+ lbi1 <- Cabal. configureComponents lbc2 pbd3 installedPkgs promisedDeps externalPkgDeps
220+
221+ pkgDescrFile <-
222+ case configCabalFilePath cfg of
223+ Just pkgFile -> return pkgFile
224+ Nothing -> relativeSymbolicPath <$> tryFindPackageDesc verbosity cwd
225+ let lbi2 = lbi1 { pkgDescrFile = configCabalFilePath cfg }
226+
220227 -- Write the LocalBuildInfo to disk. This is needed, for instance, if we
221228 -- skip re-configuring; we retrieve the LocalBuildInfo stored on disk from
222229 -- the previous invocation of 'configure' and pass it to 'build'.
223- Cabal. writePersistBuildConfig mbWorkDir distPref lbi
224- return lbi
230+ Cabal. writePersistBuildConfig mbWorkDir distPref lbi2
231+ return lbi2
225232
226233wantComponent :: ComponentRequestedSpec -> Component -> Bool
227234wantComponent compReq comp = case compReq of
You can’t perform that action at this time.
0 commit comments