diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-04-11 17:03:18 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-30 01:56:56 -0400 |
| commit | 8bfb0219587b969d5c8f723c46d433e9493958b4 (patch) | |
| tree | 7ed243039324e5a85905985589d7defd91543625 /utils | |
| parent | 10d15f1ec4bab4dd6152d87fc66e61658a705eb3 (diff) | |
| download | haskell-8bfb0219587b969d5c8f723c46d433e9493958b4.tar.gz | |
Unit: split and rename modules
Introduce GHC.Unit.* hierarchy for everything concerning units, packages
and modules.
Update Haddock submodule
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 6 | ||||
| m--------- | utils/haddock | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index c822c31c4e..b8fe8c11f9 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -30,8 +30,8 @@ module Main (main) where -import qualified GHC.PackageDb as GhcPkg -import GHC.PackageDb +import qualified GHC.Unit.Database as GhcPkg +import GHC.Unit.Database import GHC.HandleEncoding import GHC.BaseDir (getBaseDir) import GHC.Settings.Platform (getTargetPlatform) @@ -976,7 +976,7 @@ mungePackageDBPaths top_dir db@PackageDB { packages = pkgs } = mungePackagePaths :: FilePath -> FilePath -> InstalledPackageInfo -> InstalledPackageInfo mungePackagePaths top_dir pkgroot pkg = - -- TODO: similar code is duplicated in GHC.PackageDb + -- TODO: similar code is duplicated in GHC.Unit.Database pkg { importDirs = munge_paths (importDirs pkg), includeDirs = munge_paths (includeDirs pkg), diff --git a/utils/haddock b/utils/haddock -Subproject 75b9b6ebbe8326f3a2b099ab7f130960b456761 +Subproject a61dbdb0a7420e15e978bce6c09de1ce99290f4 |