Commit c15a8d6c authored by Francesco Gazzetta's avatar Francesco Gazzetta

Make use of the --dependency on component

parent e28348ab
......@@ -404,8 +404,8 @@ configurePackage verbosity platform comp scriptOptions configFlags
-- depending on the Cabal version we are talking to.
configConstraints = [ thisPackageVersion srcid
| ConfiguredId srcid (Just PkgDesc.CLibName) _uid <- CD.nonSetupDeps deps ],
configDependencies = [ GivenComponent (packageName srcid) (PkgDesc.CLibName) uid
| ConfiguredId srcid (Just PkgDesc.CLibName) uid <- CD.nonSetupDeps deps ],
configDependencies = [ GivenComponent (packageName srcid) cname uid
| ConfiguredId srcid (Just cname) uid <- CD.nonSetupDeps deps ],
-- Use '--exact-configuration' if supported.
configExactConfiguration = toFlag True,
configVerbosity = toFlag verbosity,
......
......@@ -1247,8 +1247,8 @@ installReadyPackage platform cinfo configFlags
configConstraints = [ thisPackageVersion srcid
| ConfiguredId srcid (Just PackageDescription.CLibName) _ipid
<- CD.nonSetupDeps deps ],
configDependencies = [ GivenComponent (packageName srcid) PackageDescription.CLibName dep_ipid
| ConfiguredId srcid (Just PackageDescription.CLibName) dep_ipid
configDependencies = [ GivenComponent (packageName srcid) cname dep_ipid
| ConfiguredId srcid (Just cname) dep_ipid
<- CD.nonSetupDeps deps ],
-- Use '--exact-configuration' if supported.
configExactConfiguration = toFlag True,
......
......@@ -3301,14 +3301,9 @@ setupHsConfigureFlags (ReadyPackage elab@ElaboratedConfiguredPackage{..})
-- dependencies which should NOT be fed in here (also you don't have
-- enough info anyway)
configDependencies = [ GivenComponent
(case mb_cn of
-- Special case for internal libraries
Just (CSubLibName uqn)
| packageId elab == srcid
-> mkPackageName (unUnqualComponentName uqn)
_ -> packageName srcid)
CLibName
cid
(packageName srcid)
(fromMaybe CLibName mb_cn)
cid
| ConfiguredId srcid mb_cn cid <- elabLibDependencies elab ]
configConstraints =
case elabPkgOrComp of
......
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