Skip to content

Correct store-dir dir in ghc env files generated by cabal install --lib --package-env #6298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2019
Merged

Correct store-dir dir in ghc env files generated by cabal install --lib --package-env #6298

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d3e406
Use project config instead global one to get store-dir
jneira Oct 16, 2019
598a395
Use project config instead global one to get logs-dir
jneira Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions cabal-install/Distribution/Client/CmdInstall.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,10 +458,14 @@ installAction ( configFlags, configExFlags, installFlags
home <- getHomeDirectory
let
ProjectConfig {
projectConfigBuildOnly = ProjectConfigBuildOnly {
projectConfigLogsDir
},
projectConfigShared = ProjectConfigShared {
projectConfigHcFlavor,
projectConfigHcPath,
projectConfigHcPkg
projectConfigHcPkg,
projectConfigStoreDir
},
projectConfigLocalPackages = PackageConfig {
packageConfigProgramPaths,
Expand Down Expand Up @@ -529,9 +533,9 @@ installAction ( configFlags, configExFlags, installFlags

cabalDir <- getCabalDir
mstoreDir <-
sequenceA $ makeAbsolute <$> flagToMaybe (globalStoreDir globalFlags)
sequenceA $ makeAbsolute <$> flagToMaybe projectConfigStoreDir
let
mlogsDir = flagToMaybe (globalLogsDir globalFlags)
mlogsDir = flagToMaybe projectConfigLogsDir
cabalLayout = mkCabalDirLayout cabalDir mstoreDir mlogsDir
packageDbs = storePackageDBStack (cabalStoreDirLayout cabalLayout) compilerId

Expand Down