Concat arguments when enabling haddock

haskell · Feb 9, 2025 · 3a43753 · 3a43753
1 parent 595d023
commit 3a43753
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git 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
@@ -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.
+
+}