Fix haddock keepTmpFiles logic

Author: sheaf

cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs

@@ -175,7 +175,7 @@ buildAndRegisterUnpackedPackage
   verbosity
   distDirLayout@DistDirLayout{distTempDirectory}
   maybe_semaphore
-  _buildTimeSettings
+  buildTimeSettings
   registerLock
   cacheLock
   pkgshared@ElaboratedSharedConfig
@@ -372,6 +372,7 @@ buildAndRegisterUnpackedPackage
           setupHsHaddockFlags
             pkg
             pkgshared
+            buildTimeSettings
             (commonFlags v)
       haddockArgs v =
         flip filterHaddockArgs v $

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

@@ -4114,9 +4114,14 @@ setupHsRegisterFlags
 setupHsHaddockFlags
   :: ElaboratedConfiguredPackage
   -> ElaboratedSharedConfig
+  -> BuildTimeSettings
   -> Cabal.CommonSetupFlags
   -> Cabal.HaddockFlags
-setupHsHaddockFlags (ElaboratedConfiguredPackage{..}) (ElaboratedSharedConfig{..}) common =
+setupHsHaddockFlags
+  (ElaboratedConfiguredPackage{..})
+  (ElaboratedSharedConfig{..})
+  (BuildTimeSettings {buildSettingKeepTempFiles = keepTmpFiles})
+  common =
   Cabal.HaddockFlags
     { haddockCommonFlags = common
     , haddockProgramPaths =
@@ -4143,7 +4148,7 @@ setupHsHaddockFlags (ElaboratedConfiguredPackage{..}) (ElaboratedSharedConfig{..
     , haddockQuickJump = toFlag elabHaddockQuickJump
     , haddockHscolourCss = maybeToFlag elabHaddockHscolourCss
     , haddockContents = maybeToFlag elabHaddockContents
-    , haddockKeepTempFiles = mempty -- TODO: from build settings
+    , haddockKeepTempFiles = toFlag keepTmpFiles
     , haddockIndex = maybeToFlag elabHaddockIndex
     , haddockBaseUrl = maybeToFlag elabHaddockBaseUrl
     , haddockLib = maybeToFlag elabHaddockLib