Skip to content

Set abiDepends field in IPI to [] #5478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2018
Merged

Set abiDepends field in IPI to [] #5478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cabal/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
* Added a parameter to
`Distribution.Backpack.ConfiguredComponent.toConfiguredComponent` in order to fix
[#5409](https://github.com/haskell/cabal/issues/5409).
* Partially silence `abi-depends` warnings
([#5465](https://github.com/haskell/cabal/issues/5465)).

----

Expand Down
9 changes: 1 addition & 8 deletions Cabal/Distribution/Simple/Register.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
IPI.includeDirs = absinc ++ adjustRelIncDirs relinc,
IPI.includes = includes bi,
IPI.depends = depends,
IPI.abiDepends = abi_depends,
IPI.abiDepends = [], -- due to #5465
IPI.ccOptions = [], -- Note. NOT ccOptions bi!
-- We don't want cc-options to be propagated
-- to C compilations in other packages.
Expand All @@ -458,13 +458,6 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
--TODO: unclear what the root cause of the
-- duplication is, but we nub it here for now:
depends = ordNub $ map fst (componentPackageDeps clbi)
abi_depends = map add_abi depends
add_abi uid = IPI.AbiDependency uid abi
where
abi = case Index.lookupUnitId (installedPkgs lbi) uid of
Nothing -> error $
"generalInstalledPackageInfo: missing IPI for " ++ display uid
Just ipi -> IPI.abiHash ipi
(absinc, relinc) = partition isAbsolute (includeDirs bi)
hasModules = not $ null (allLibModules lib clbi)
comp = compiler lbi
Expand Down