summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
Diffstat (limited to 'ghc')
-rw-r--r--ghc/GHCi/UI.hs3
-rw-r--r--ghc/Main.hs6
2 files changed, 5 insertions, 4 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index ec70fc037d..2472b80897 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -2345,7 +2345,8 @@ isSafeModule m = do
tallyPkgs dflags deps | not (packageTrustOn dflags) = (S.empty, S.empty)
| otherwise = S.partition part deps
- where part pkg = trusted $ getInstalledPackageDetails dflags pkg
+ where part pkg = trusted $ getInstalledPackageDetails pkgstate pkg
+ pkgstate = pkgState dflags
-----------------------------------------------------------------------------
-- :browse
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 3cec5b6191..3552133891 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -865,9 +865,9 @@ dumpFastStringStats dflags = do
x `pcntOf` y = int ((x * 100) `quot` y) Outputable.<> char '%'
showPackages, dumpPackages, dumpPackagesSimple :: DynFlags -> IO ()
-showPackages dflags = putStrLn (showSDoc dflags (pprPackages dflags))
-dumpPackages dflags = putMsg dflags (pprPackages dflags)
-dumpPackagesSimple dflags = putMsg dflags (pprPackagesSimple dflags)
+showPackages dflags = putStrLn (showSDoc dflags (pprPackages (pkgState dflags)))
+dumpPackages dflags = putMsg dflags (pprPackages (pkgState dflags))
+dumpPackagesSimple dflags = putMsg dflags (pprPackagesSimple (pkgState dflags))
-- -----------------------------------------------------------------------------
-- Frontend plugin support