Try fixing addInternalBuildTools

See haskell#8421 and maybe haskell#9854

Cabal/src/Distribution/Simple/Build.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE NamedFieldPuns #-}
 
 -----------------------------------------------------------------------------
 
@@ -75,7 +76,6 @@ import Distribution.Simple.PreProcess
 import Distribution.Simple.Program
 import Distribution.Simple.Program.Builtin (haskellSuiteProgram)
 import qualified Distribution.Simple.Program.GHC as GHC
-import Distribution.Simple.Program.Types
 import Distribution.Simple.Register
 import Distribution.Simple.Setup.Build
 import Distribution.Simple.Setup.Config
@@ -586,17 +586,15 @@ generateCode codeGens nm pdesc bi lbi clbi verbosity = do
     nm' = unUnqualComponentName nm
     tgtDir = buildDir lbi </> nm' </> nm' ++ "-gen"
     go :: String -> IO [ModuleName.ModuleName]
-    go codeGenProg =
-      fmap fromString . lines
-        <$> getDbProgramOutput
-          verbosity
-          (simpleProgram codeGenProg)
-          (withPrograms lbi)
+    go codeGenProg = do
+      (confProg, _progdb) <- requireProgram verbosity (simpleProgram codeGenProg) (withPrograms lbi)
+      output <- getProgramOutput verbosity confProg 
           ( (tgtDir : map getSymbolicPath srcDirs)
               ++ ( "--"
                     : GHC.renderGhcOptions (compiler lbi) (hostPlatform lbi) (GHC.componentGhcOptions verbosity lbi bi clbi tgtDir)
                  )
           )
+      return $ fmap fromString $ lines output
 
 -- | Add extra C sources generated by preprocessing to build
 -- information.
@@ -933,14 +931,11 @@ addInternalBuildTools
   -> BuildInfo
   -> ProgramDb
   -> ProgramDb
-addInternalBuildTools pkg lbi bi progs =
-  foldr updateProgram progs internalBuildTools
-  where
-    internalBuildTools =
-      [ simpleConfiguredProgram toolName' (FoundOnSystem toolLocation)
+addInternalBuildTools pkg lbi bi =
+  addKnownPrograms
+      [ simpleProgram toolName'
       | toolName <- getAllInternalToolDependencies pkg bi
       , let toolName' = unUnqualComponentName toolName
-      , let toolLocation = buildDir lbi </> toolName' </> toolName' <.> exeExtension (hostPlatform lbi)
       ]
 
 -- TODO: build separate libs in separate dirs so that we can build