Skip to content

Commit 7e0de4b

Browse files
committed
in-library: set pkgDescrFile
1 parent 90cab81 commit 7e0de4b

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

cabal-install/src/Distribution/Client/InLibrary.hs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ import Distribution.Types.BuildType
5353
import Distribution.Types.ComponentRequestedSpec
5454
import qualified Distribution.Types.LocalBuildConfig as LBC
5555
import Distribution.Types.LocalBuildInfo
56+
import Distribution.Utils.Path
57+
( relativeSymbolicPath )
5658

5759
import qualified Data.Set as Set
5860

@@ -216,12 +218,19 @@ configure
216218
OneComponentRequestedSpec{} -> True
217219
ComponentRequestedSpec{} -> False
218220
externalPkgDeps <- Cabal.configureDependencies verbosity useExternalInternalDeps pkg_info pkg_descr compRequested
219-
lbi <- Cabal.configureComponents lbc2 pbd3 installedPkgs promisedDeps externalPkgDeps
221+
lbi1 <- Cabal.configureComponents lbc2 pbd3 installedPkgs promisedDeps externalPkgDeps
222+
223+
pkgDescrFile <-
224+
case Cabal.flagToMaybe $ Cabal.configCabalFilePath cfg of
225+
Just pkgFile -> return pkgFile
226+
Nothing -> relativeSymbolicPath <$> tryFindPackageDesc verbosity mbWorkDir
227+
let lbi2 = lbi1 { pkgDescrFile = Just pkgDescrFile }
228+
220229
-- Write the LocalBuildInfo to disk. This is needed, for instance, if we
221230
-- skip re-configuring; we retrieve the LocalBuildInfo stored on disk from
222231
-- the previous invocation of 'configure' and pass it to 'build'.
223-
Cabal.writePersistBuildConfig mbWorkDir distPref lbi
224-
return lbi
232+
Cabal.writePersistBuildConfig mbWorkDir distPref lbi2
233+
return lbi2
225234

226235
wantComponent :: ComponentRequestedSpec -> Component -> Bool
227236
wantComponent compReq comp = case compReq of

0 commit comments

Comments
 (0)