Skip to content

cabal: filtering GHC args #11259

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

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

cabal: filtering GHC args #11259

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
13 changes: 12 additions & 1 deletion cabal-install/src/Distribution/Client/ProjectPlanning.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2379,6 +2379,17 @@ elaborateInstallPlan
]
)
(perPkgOptionMapMappend pkgid packageConfigProgramArgs)
elabNormalisedProgramArgs =
Map.unionWith
(++)
( Map.fromList
[ (programId prog, args)
| prog <- configuredPrograms compilerprogdb
, let args = programOverrideArgs $ addHaddockIfDocumentationEnabled prog
, not (null args)
]
)
(perPkgOptionMapMappend pkgid packageConfigProgramArgs)
Comment thread
coot marked this conversation as resolved.
elabProgramPathExtra = perPkgOptionNubList pkgid packageConfigProgramPathExtra
elabConfiguredPrograms = configuredPrograms compilerprogdb
elabConfigureScriptArgs = perPkgOptionList pkgid packageConfigConfigureArgs
Expand Down Expand Up @@ -4513,7 +4524,7 @@ packageHashConfigInputs shared@ElaboratedSharedConfig{..} pkg =
, pkgHashStripLibs = stripLibs
, pkgHashStripExes = stripExes
, pkgHashDebugInfo = withDebugInfo
, pkgHashProgramArgs = elabProgramArgs
, pkgHashProgramArgs = elabNormalisedProgramArgs
, pkgHashExtraLibDirs = elabExtraLibDirs
, pkgHashExtraLibDirsStatic = elabExtraLibDirsStatic
, pkgHashExtraFrameworkDirs = elabExtraFrameworkDirs
Expand Down
3 changes: 2 additions & 1 deletion cabal-install/src/Distribution/Client/ProjectPlanning/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ data ElaboratedConfiguredPackage = ElaboratedConfiguredPackage
, elabDumpBuildInfo :: DumpBuildInfo
, elabProgramPaths :: Map String FilePath
, elabProgramArgs :: Map String [String]
, elabNormalisedProgramArgs :: Map String [String]
, elabProgramPathExtra :: [FilePath]
, elabConfiguredPrograms :: [ConfiguredProgram]
, elabConfigureScriptArgs :: [String]
Expand Down Expand Up @@ -345,7 +346,7 @@ normaliseConfiguredPackage
-> ElaboratedConfiguredPackage
-> ElaboratedConfiguredPackage
normaliseConfiguredPackage ElaboratedSharedConfig{pkgConfigCompilerProgs} pkg =
pkg{elabProgramArgs = Map.mapMaybeWithKey lookupFilter (elabProgramArgs pkg)}
pkg{elabNormalisedProgramArgs = Map.mapMaybeWithKey lookupFilter (elabProgramArgs pkg)}
where
knownProgramDb = addKnownPrograms builtinPrograms pkgConfigCompilerProgs

Expand Down
5 changes: 5 additions & 0 deletions changelog.d/pr-11259.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
synopsis: Do not filter program arguments (e.g. for ghc, etc)
packages: [Cabal]
prs: 11259
---
Loading