Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
0a7dd80c
Commit
0a7dd80c
authored
Jul 07, 2018
by
Alexis Williams
Browse files
Use updated program DB.
parent
6843798b
Changes
1
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/CmdInstall.hs
View file @
0a7dd80c
...
...
@@ -316,9 +316,9 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
(
++
[
ProgramSearchPathDir
dir
|
dir
<-
fromNubList
packageConfigProgramPathExtra
])
$
defaultProgramDb
(
compiler
@
Compiler
{
compilerId
=
compilerId
@
(
CompilerId
compilerFlavor
compilerVersion
)
},
platform
,
_
)
<-
compilerId
@
(
CompilerId
compilerFlavor
compilerVersion
)
},
platform
,
progDb'
)
<-
configCompilerEx
hcFlavor
hcPath
hcPkg
progDb
verbosity
let
...
...
@@ -340,7 +340,7 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
cabalLayout
=
mkCabalDirLayout
cabalDir
mstoreDir
mlogsDir
packageDbs
=
storePackageDBStack
(
cabalStoreDirLayout
cabalLayout
)
compilerId
installedIndex
<-
getInstalledPackages
verbosity
compiler
packageDbs
progDb
installedIndex
<-
getInstalledPackages
verbosity
compiler
packageDbs
progDb
'
let
envSpecs
=
environmentFileToSpecifiers
installedIndex
envEntries
...
...
@@ -408,19 +408,16 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
$
Map
.
toList
$
targetsMap
buildCtx
runProjectPostBuildPhase
verbosity
baseCtx
buildCtx
buildOutcomes
unless
supportsPkgEnvFiles
$
unless
supportsPkgEnvFiles
$
do
warn
verbosity
"The current compiler doesn't support safely installing libraries. (GHC 8.0+ only)"
let
baseEntries
=
GhcEnvFileClearPackageDbStack
:
fmap
GhcEnvFilePackageDb
packageDbs
entries
=
baseEntries
++
entriesForLibraryComponents
(
targetsMap
buildCtx
)
createDirectoryIfMissing
True
(
takeDirectory
envFile
)
when
supportsPkgEnvFiles
$
do
let
let
baseEntries
=
GhcEnvFileClearPackageDbStack
:
fmap
GhcEnvFilePackageDb
packageDbs
entries
=
baseEntries
++
entriesForLibraryComponents
(
targetsMap
buildCtx
)
entries'
=
nub
(
envEntries
++
entries
)
contents'
=
renderGhcEnvironmentFile
entries'
createDirectoryIfMissing
True
(
takeDirectory
envFile
)
writeFileAtomic
envFile
(
BS
.
pack
contents'
)
where
configFlags'
=
disableTestsBenchsByDefault
configFlags
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment