From f3f624aeb1360c1f902930b3cc62346d2e5201c0 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Tue, 3 Oct 2017 15:08:24 -0400 Subject: Include libraries which fill holes as deps when linking. Fixes the issue reported at https://github.com/haskell/cabal/issues/4755 and fixes #14304 in the GHC tracker. Signed-off-by: Edward Z. Yang Test Plan: validate Reviewers: bgamari, austin, goldfire Reviewed By: bgamari Subscribers: rwbarton, thomie GHC Trac Issues: #14304 Differential Revision: https://phabricator.haskell.org/D4057 --- compiler/main/Packages.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'compiler/main/Packages.hs') diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs index 172e1818fc..949cc0f231 100644 --- a/compiler/main/Packages.hs +++ b/compiler/main/Packages.hs @@ -1878,8 +1878,10 @@ listVisibleModuleNames dflags = -- | Find all the 'PackageConfig' in both the preload packages from 'DynFlags' and corresponding to the list of -- 'PackageConfig's getPreloadPackagesAnd :: DynFlags -> [PreloadUnitId] -> IO [PackageConfig] -getPreloadPackagesAnd dflags pkgids = +getPreloadPackagesAnd dflags pkgids0 = let + pkgids = pkgids0 ++ map (toInstalledUnitId . moduleUnitId . snd) + (thisUnitIdInsts dflags) state = pkgState dflags pkg_map = pkgIdMap state preload = preloadPackages state -- cgit v1.2.1