Commit ef7235c7 authored by Edward Z. Yang's avatar Edward Z. Yang
Browse files

Generate package registraion with instantiation info

Correctly setup 'instantiatedWith' in 'InstalledPackageInfo'.

Also ensure that there are no duplicate entries in 'depends'
(I couldn't find the root cause for duplication, so I just
put the test here.)
parent 2515cc28
......@@ -389,7 +389,7 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
pkgName = componentCompatPackageName clbi
},
IPI.installedUnitId = componentUnitId clbi,
IPI.instantiatedWith = [], --TODO fill in properly
IPI.instantiatedWith = componentInstantiatedWith clbi,
IPI.compatPackageKey = componentCompatPackageKey clbi,
IPI.license = license pkg,
IPI.copyright = copyright pkg,
......@@ -420,7 +420,9 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
IPI.extraGHCiLibraries = extraGHCiLibs bi,
IPI.includeDirs = absinc ++ adjustRelIncDirs relinc,
IPI.includes = includes bi,
IPI.depends = map fst (componentPackageDeps clbi),
--TODO: unclear what the root cause of the
-- duplication is, but we nub it here for now:
IPI.depends = ordNub $ map fst (componentPackageDeps clbi),
IPI.ccOptions = [], -- Note. NOT ccOptions bi!
-- We don't want cc-options to be propagated
-- to C compilations in other packages.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment