Skip to content

Commit e8538c6

Browse files
committed
Revert "cabal-install configureCompiler: configure progdb"
This reverts commit 8bdda9c.
1 parent 62af110 commit e8538c6

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

cabal-install/src/Distribution/Client/ProjectPlanning.hs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ configureCompiler
491491
let extraPath = fromNubList packageConfigProgramPathExtra
492492
progdb <- liftIO $ prependProgramSearchPath verbosity extraPath [] defaultProgramDb
493493
let progdb' = userSpecifyPaths (Map.toList (getMapLast packageConfigProgramPaths)) progdb
494-
(comp, plat, progdb'') <-
494+
result@(_, _, progdb'') <-
495495
liftIO $
496496
Cabal.configCompilerEx
497497
hcFlavor
@@ -508,12 +508,7 @@ configureCompiler
508508
-- programs it cares about, and those are the ones we monitor here.
509509
monitorFiles (programsMonitorFiles progdb'')
510510

511-
-- Configure the unconfigured programs in the program database,
512-
-- as we can't serialise unconfigured programs.
513-
-- See also #2241 and #9840.
514-
finalProgDb <- liftIO $ configureAllKnownPrograms verbosity progdb''
515-
516-
return (comp, plat, finalProgDb)
511+
return result
517512
where
518513
hcFlavor = flagToMaybe projectConfigHcFlavor
519514
hcPath = flagToMaybe projectConfigHcPath

cabal-testsuite/PackageTests/ExtraProgPath/setup.out

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# cabal v2-build
22
Warning: cannot determine version of <ROOT>/pkg-config :
33
""
4-
Configuration is affected by the following files:
5-
- cabal.project
64
Resolving dependencies...
75
Error: [Cabal-7107]
86
Could not resolve dependencies:

0 commit comments

Comments
 (0)