diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-13 11:32:41 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-13 02:13:03 -0400 |
| commit | ed533ec217667423e4fce30040f24053dbcc7de4 (patch) | |
| tree | a810bd338fb4044538fba0c78df041a3e2c225e1 /compiler/GHC/SysTools | |
| parent | f50c19b8a78da9252cb39f49c1c66db4a684cc3b (diff) | |
| download | haskell-ed533ec217667423e4fce30040f24053dbcc7de4.tar.gz | |
Rename Package into Unit
The terminology changed over time and now package databases contain
"units" (there can be several units compiled from a single Cabal
package: one per-component, one for each option set, one per
instantiation, etc.). We should try to be consistent internally and use
"units": that's what this renaming does. Maybe one day we'll fix the UI
too (e.g. replace -package-id with -unit-id, we already have
-this-unit-id and ghc-pkg has -unit-id...) but it's not done in this
patch.
* rename getPkgFrameworkOpts into getUnitFrameworkOpts
* rename UnitInfoMap into ClosureUnitInfoMap
* rename InstalledPackageIndex into UnitInfoMap
* rename UnusablePackages into UnusableUnits
* rename PackagePrecedenceIndex into UnitPrecedenceMap
* rename PackageDatabase into UnitDatabase
* rename pkgDatabase into unitDatabases
* rename pkgState into unitState
* rename initPackages into initUnits
* rename renamePackage into renameUnitInfo
* rename UnusablePackageReason into UnusableUnitReason
* rename getPackage* into getUnit*
* etc.
Diffstat (limited to 'compiler/GHC/SysTools')
| -rw-r--r-- | compiler/GHC/SysTools/ExtraObj.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/GHC/SysTools/ExtraObj.hs b/compiler/GHC/SysTools/ExtraObj.hs index 789a3ed661..643ccdff18 100644 --- a/compiler/GHC/SysTools/ExtraObj.hs +++ b/compiler/GHC/SysTools/ExtraObj.hs @@ -50,7 +50,7 @@ mkExtraObj dflags extn xs else asmOpts ccInfo) return oFile where - pkgs = pkgState dflags + pkgs = unitState dflags -- Pass a different set of options to the C compiler depending one whether -- we're compiling C or assembler. When compiling C, we pass the usual @@ -170,9 +170,9 @@ mkNoteObjsToLinkIntoBinary dflags dep_packages = do -- See Note [LinkInfo section] getLinkInfo :: DynFlags -> [UnitId] -> IO String getLinkInfo dflags dep_packages = do - package_link_opts <- getPackageLinkOpts dflags dep_packages + package_link_opts <- getUnitLinkOpts dflags dep_packages pkg_frameworks <- if platformUsesFrameworks (targetPlatform dflags) - then getPackageFrameworks dflags dep_packages + then getUnitFrameworks dflags dep_packages else return [] let extra_ld_inputs = ldInputs dflags let |