From 9021eb68f94353e1910d74d34cbddb5824ae671e Mon Sep 17 00:00:00 2001 From: vrom911 Date: Tue, 31 Jul 2018 21:29:39 +0800 Subject: [PATCH] Set abiDepends field in IPI to [] --- Cabal/ChangeLog.md | 2 ++ Cabal/Distribution/Simple/Register.hs | 9 +-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md index 182e7143ba2..2d8e82897d5 100644 --- a/Cabal/ChangeLog.md +++ b/Cabal/ChangeLog.md @@ -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)). ---- diff --git a/Cabal/Distribution/Simple/Register.hs b/Cabal/Distribution/Simple/Register.hs index 3545199595f..461b3123de8 100644 --- a/Cabal/Distribution/Simple/Register.hs +++ b/Cabal/Distribution/Simple/Register.hs @@ -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. @@ -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