diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-03-27 10:49:16 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-30 01:56:56 -0400 |
| commit | 10a2ba90aa6a788677104cc43318c66f46e2e2b0 (patch) | |
| tree | 86f1cadd79243ef67a7f150c5f074e5aa2115ccf /compiler/GHC/SysTools/ExtraObj.hs | |
| parent | 2cfc4ab9710c873a55e9a44aac9dacb06ecce36f (diff) | |
| download | haskell-10a2ba90aa6a788677104cc43318c66f46e2e2b0.tar.gz | |
Refactor UnitInfo
* Rename InstalledPackageInfo into GenericUnitInfo
The name InstalledPackageInfo is only kept for alleged backward
compatibility reason in Cabal. ghc-boot has its own stripped down copy
of this datatype but it doesn't need to keep the name. Internally we
already use type aliases (UnitInfo in GHC, PackageCacheFormat in
ghc-pkg).
* Rename UnitInfo fields: add "unit" prefix and fix misleading names
* Add comments on every UnitInfo field
* Rename SourcePackageId into PackageId
"Package" already indicates that it's a "source package". Installed
package components are called units.
Update Haddock submodule
Diffstat (limited to 'compiler/GHC/SysTools/ExtraObj.hs')
| -rw-r--r-- | compiler/GHC/SysTools/ExtraObj.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/GHC/SysTools/ExtraObj.hs b/compiler/GHC/SysTools/ExtraObj.hs index 0a04860185..652d8cd897 100644 --- a/compiler/GHC/SysTools/ExtraObj.hs +++ b/compiler/GHC/SysTools/ExtraObj.hs @@ -55,7 +55,7 @@ mkExtraObj dflags extn xs -- set of include directories and PIC flags. cOpts = map Option (picCCOpts dflags) ++ map (FileOption "-I") - (includeDirs $ getPackageDetails dflags rtsUnitId) + (unitIncludeDirs $ getPackageDetails dflags rtsUnitId) -- When compiling assembler code, we drop the usual C options, and if the -- compiler is Clang, we add an extra argument to tell Clang to ignore |