From 734f4f9308e2fc5a4f12b2a5ab51f456ca5f9e98 Mon Sep 17 00:00:00 2001 From: Javier Sagredo Date: Sat, 8 Feb 2025 16:42:19 +0100 Subject: [PATCH] Concat arguments when enabling haddock --- cabal-install/src/Distribution/Client/ProjectPlanning.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs index c04bca730d7..3e567892d58 100644 --- a/cabal-install/src/Distribution/Client/ProjectPlanning.hs +++ b/cabal-install/src/Distribution/Client/ProjectPlanning.hs @@ -2319,13 +2319,13 @@ elaborateInstallPlan ] <> perPkgOptionMapLast pkgid packageConfigProgramPaths elabProgramArgs = - Map.fromList + Map.unionWith (++) (Map.fromList [ (programId prog, args) | prog <- configuredPrograms compilerprogdb , let args = programOverrideArgs $ addHaddockIfDocumentationEnabled prog , not (null args) - ] - <> perPkgOptionMapMappend pkgid packageConfigProgramArgs + ]) + (perPkgOptionMapMappend pkgid packageConfigProgramArgs) elabProgramPathExtra = perPkgOptionNubList pkgid packageConfigProgramPathExtra elabConfigureScriptArgs = perPkgOptionList pkgid packageConfigConfigureArgs elabExtraLibDirs = perPkgOptionList pkgid packageConfigExtraLibDirs