Skip to content

Commit 6ac9dfb

Browse files
sheafMikolaj
authored andcommitted
Remove haskell-suite-dummy-program hack
There was some hacky logic in place to give a "haskell-suite" compiler a dummy location so that we would attempt to configure it. This logic is no longer necessary since 'configureRequiredProgram' was changed to accomodate the situation in which 'lookupKnownProgram' fails. In fact, it is downright harmful, as this dummy location will trigger errors when we attempt to configure all known programs, which is a necessary step before attempting to serialise a program database.
1 parent 0a0cc19 commit 6ac9dfb

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

Cabal/src/Distribution/Simple/Program/Builtin.hs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -226,21 +226,13 @@ hpcProgram =
226226
-- during the configure phase.
227227
haskellSuiteProgram :: Program
228228
haskellSuiteProgram =
229-
(simpleProgram "haskell-suite")
230-
{ -- pretend that the program exists, otherwise it won't be in the
231-
-- "configured" state
232-
programFindLocation = \_verbosity _searchPath ->
233-
return $ Just ("haskell-suite-dummy-location", [])
234-
}
229+
simpleProgram "haskell-suite"
235230

236231
-- This represent a haskell-suite package manager. See the comments for
237232
-- haskellSuiteProgram.
238233
haskellSuitePkgProgram :: Program
239234
haskellSuitePkgProgram =
240-
(simpleProgram "haskell-suite-pkg")
241-
{ programFindLocation = \_verbosity _searchPath ->
242-
return $ Just ("haskell-suite-pkg-dummy-location", [])
243-
}
235+
simpleProgram "haskell-suite-pkg"
244236

245237
happyProgram :: Program
246238
happyProgram =

0 commit comments

Comments
 (0)