From 3a43753f5ee526fb4a65b1a7aacbc9ed5cd0568c 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 --- .../src/Distribution/Client/ProjectPlanning.hs | 17 ++++++++++------- changelog.d/pr-10783 | 11 +++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 changelog.d/pr-10783 diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs index c04bca730d7..4bc488ba405 100644 --- a/cabal-install/src/Distribution/Client/ProjectPlanning.hs +++ b/cabal-install/src/Distribution/Client/ProjectPlanning.hs @@ -2319,13 +2319,16 @@ elaborateInstallPlan ] <> perPkgOptionMapLast pkgid packageConfigProgramPaths elabProgramArgs = - Map.fromList - [ (programId prog, args) - | prog <- configuredPrograms compilerprogdb - , let args = programOverrideArgs $ addHaddockIfDocumentationEnabled prog - , not (null args) - ] - <> perPkgOptionMapMappend pkgid packageConfigProgramArgs + Map.unionWith + (++) + ( Map.fromList + [ (programId prog, args) + | prog <- configuredPrograms compilerprogdb + , let args = programOverrideArgs $ addHaddockIfDocumentationEnabled prog + , not (null args) + ] + ) + (perPkgOptionMapMappend pkgid packageConfigProgramArgs) elabProgramPathExtra = perPkgOptionNubList pkgid packageConfigProgramPathExtra elabConfigureScriptArgs = perPkgOptionList pkgid packageConfigConfigureArgs elabExtraLibDirs = perPkgOptionList pkgid packageConfigExtraLibDirs diff --git a/changelog.d/pr-10783 b/changelog.d/pr-10783 new file mode 100644 index 00000000000..a8efcf12cda --- /dev/null +++ b/changelog.d/pr-10783 @@ -0,0 +1,11 @@ +synopsis: GHC arguments are no longer swallowed by enabling documentation +packages: Cabal +prs: #10783 +issues: #10782 +significance: significant + +description: { + +- Arguments to GHC are now properly concatenated with `-haddock` if documentation is enabled. + +}