Skip to content

Commit 9e0ab3b

Browse files
jneiraDanielG
authored andcommitted
Fix store-dir in ghc env files generated by cabal install --lib --package-env (#6298)
Use project config instead of global one to get store-dir and logs-dir. Fixes #5925
1 parent b7d5bcb commit 9e0ab3b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

cabal-install/Distribution/Client/CmdInstall.hs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,14 @@ installAction ( configFlags, configExFlags, installFlags
458458
home <- getHomeDirectory
459459
let
460460
ProjectConfig {
461+
projectConfigBuildOnly = ProjectConfigBuildOnly {
462+
projectConfigLogsDir
463+
},
461464
projectConfigShared = ProjectConfigShared {
462465
projectConfigHcFlavor,
463466
projectConfigHcPath,
464-
projectConfigHcPkg
467+
projectConfigHcPkg,
468+
projectConfigStoreDir
465469
},
466470
projectConfigLocalPackages = PackageConfig {
467471
packageConfigProgramPaths,
@@ -529,9 +533,9 @@ installAction ( configFlags, configExFlags, installFlags
529533

530534
cabalDir <- getCabalDir
531535
mstoreDir <-
532-
sequenceA $ makeAbsolute <$> flagToMaybe (globalStoreDir globalFlags)
536+
sequenceA $ makeAbsolute <$> flagToMaybe projectConfigStoreDir
533537
let
534-
mlogsDir = flagToMaybe (globalLogsDir globalFlags)
538+
mlogsDir = flagToMaybe projectConfigLogsDir
535539
cabalLayout = mkCabalDirLayout cabalDir mstoreDir mlogsDir
536540
packageDbs = storePackageDBStack (cabalStoreDirLayout cabalLayout) compilerId
537541

0 commit comments

Comments
 (0)