Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Concat arguments when enabling haddock #10783

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Concat arguments when enabling haddock #10783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions cabal-install/src/Distribution/Client/ProjectPlanning.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions changelog.d/pr-10783
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

}
Loading