Skip to content

Commit e8d4281

Browse files
committed
Only collect buildDepends from enabled components when configuring
Might need to change a few other `buildDepends` too?
1 parent 24c718c commit e8d4281

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Cabal/Distribution/Simple/Configure.hs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ configure (pkg_descr0', pbi) cfg = do
512512
installedPackageSet
513513
requiredDepsMap
514514
pkg_descr
515+
enabled
515516

516517
-- Compute installation directory templates, based on user
517518
-- configuration.
@@ -975,9 +976,10 @@ configureDependencies
975976
-> InstalledPackageIndex -- ^ installed packages
976977
-> Map (PackageName, ComponentName) InstalledPackageInfo -- ^ required deps
977978
-> PackageDescription
979+
-> ComponentRequestedSpec
978980
-> IO [(PackageName, ComponentName, InstalledPackageInfo)]
979981
configureDependencies verbosity use_external_internal_deps
980-
installedPackageSet requiredDepsMap pkg_descr = do
982+
installedPackageSet requiredDepsMap pkg_descr enableSpec = do
981983
let selectDependencies :: [LibDependency] ->
982984
([FailedDependency], [ResolvedDependency])
983985
selectDependencies =
@@ -986,7 +988,8 @@ configureDependencies verbosity use_external_internal_deps
986988
installedPackageSet
987989
requiredDepsMap use_external_internal_deps)
988990

989-
(failedDeps, allPkgDeps) = selectDependencies (buildDepends pkg_descr)
991+
(failedDeps, allPkgDeps) =
992+
selectDependencies (buildDependencies =<< enabledBuildInfos pkg_descr enableSpec)
990993

991994
internalPkgDeps =
992995
[ dep | InternalDependency dep _ <- allPkgDeps ]

0 commit comments

Comments
 (0)