Skip to content

Commit dd3fee1

Browse files
vrom911hvr
authored andcommitted
Set abiDepends field in IPI to []
1 parent 6b6d588 commit dd3fee1

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

Cabal/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
* Added a parameter to
8181
`Distribution.Backpack.ConfiguredComponent.toConfiguredComponent` in order to fix
8282
[#5409](https://github.com/haskell/cabal/issues/5409).
83+
* Partially silence `abi-depends` warnings
84+
([#5465](https://github.com/haskell/cabal/issues/5465)).
8385

8486
----
8587

Cabal/Distribution/Simple/Register.hs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
437437
IPI.includeDirs = absinc ++ adjustRelIncDirs relinc,
438438
IPI.includes = includes bi,
439439
IPI.depends = depends,
440-
IPI.abiDepends = abi_depends,
440+
IPI.abiDepends = [], -- due to #5465
441441
IPI.ccOptions = [], -- Note. NOT ccOptions bi!
442442
-- We don't want cc-options to be propagated
443443
-- to C compilations in other packages.
@@ -458,13 +458,6 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
458458
--TODO: unclear what the root cause of the
459459
-- duplication is, but we nub it here for now:
460460
depends = ordNub $ map fst (componentPackageDeps clbi)
461-
abi_depends = map add_abi depends
462-
add_abi uid = IPI.AbiDependency uid abi
463-
where
464-
abi = case Index.lookupUnitId (installedPkgs lbi) uid of
465-
Nothing -> error $
466-
"generalInstalledPackageInfo: missing IPI for " ++ display uid
467-
Just ipi -> IPI.abiHash ipi
468461
(absinc, relinc) = partition isAbsolute (includeDirs bi)
469462
hasModules = not $ null (allLibModules lib clbi)
470463
comp = compiler lbi

0 commit comments

Comments
 (0)