diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-27 14:47:33 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-30 15:14:05 -0700 |
| commit | 39b71e81ec1044518f065d0055676d713521e483 (patch) | |
| tree | 2ebf64b72c4f81138a07199571b21bd3ec6dd7c5 /compiler/main/DynFlags.hs | |
| parent | 91c6b1f54aea658b0056caec45655475897f1972 (diff) | |
| download | haskell-39b71e81ec1044518f065d0055676d713521e483.tar.gz | |
Reimplement shadowing on a per database basis.
Summary:
This commit reimplements shadowing on package databases by doing
the shadowing calculation on a per-database basis: specifically,
if a later package database shadows a package from the earlier
databases, we first remove that package (and its transitive
dependencies) before merging the databases together.
This should also fix bootstrapping GHC HEAD with HEAD.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: ggreif, bgamari, austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1385
Diffstat (limited to 'compiler/main/DynFlags.hs')
| -rw-r--r-- | compiler/main/DynFlags.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 8e5ba6a925..0c1facc3ad 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -791,7 +791,7 @@ data DynFlags = DynFlags { -- Package state -- NB. do not modify this field, it is calculated by -- Packages.initPackages - pkgDatabase :: Maybe [PackageConfig], + pkgDatabase :: Maybe [(FilePath, [PackageConfig])], pkgState :: PackageState, -- Temporary files |