File tree 1 file changed +5
-2
lines changed
Cabal/Distribution/Simple 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -512,6 +512,7 @@ configure (pkg_descr0', pbi) cfg = do
512
512
installedPackageSet
513
513
requiredDepsMap
514
514
pkg_descr
515
+ enabled
515
516
516
517
-- Compute installation directory templates, based on user
517
518
-- configuration.
@@ -975,9 +976,10 @@ configureDependencies
975
976
-> InstalledPackageIndex -- ^ installed packages
976
977
-> Map (PackageName , ComponentName ) InstalledPackageInfo -- ^ required deps
977
978
-> PackageDescription
979
+ -> ComponentRequestedSpec
978
980
-> IO [(PackageName , ComponentName , InstalledPackageInfo )]
979
981
configureDependencies verbosity use_external_internal_deps
980
- installedPackageSet requiredDepsMap pkg_descr = do
982
+ installedPackageSet requiredDepsMap pkg_descr enableSpec = do
981
983
let selectDependencies :: [LibDependency ] ->
982
984
([FailedDependency ], [ResolvedDependency ])
983
985
selectDependencies =
@@ -986,7 +988,8 @@ configureDependencies verbosity use_external_internal_deps
986
988
installedPackageSet
987
989
requiredDepsMap use_external_internal_deps)
988
990
989
- (failedDeps, allPkgDeps) = selectDependencies (buildDepends pkg_descr)
991
+ (failedDeps, allPkgDeps) =
992
+ selectDependencies (buildDependencies =<< enabledBuildInfos pkg_descr enableSpec)
990
993
991
994
internalPkgDeps =
992
995
[ dep | InternalDependency dep _ <- allPkgDeps ]
You can’t perform that action at this time.
0 commit comments