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

Jump to bottom

Include extra-lib-dirs-static into PackageHash #7794

Merged
merged 2 commits into from
Dec 17, 2022
Merged

Include extra-lib-dirs-static into PackageHash #7794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edd0ad2
Include extra-lib-dirs-static into PackageHash
alexbiehl Nov 3, 2021
d30e2be
Add changelog entry
alexbiehl Dec 15, 2022
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
2 changes: 2 additions & 0 deletions cabal-install/src/Distribution/Client/PackageHash.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ data PackageHashConfigInputs = PackageHashConfigInputs {
pkgHashDebugInfo :: DebugInfoLevel,
pkgHashProgramArgs :: Map String [String],
pkgHashExtraLibDirs :: [FilePath],
pkgHashExtraLibDirsStatic :: [FilePath],
pkgHashExtraFrameworkDirs :: [FilePath],
pkgHashExtraIncludeDirs :: [FilePath],
pkgHashProgPrefix :: Maybe PathTemplate,
Expand Down Expand Up @@ -293,6 +294,7 @@ renderPackageHashInputs PackageHashInputs{
, opt "stripped-exe" True prettyShow pkgHashStripExes
, opt "debug-info" NormalDebugInfo (show . fromEnum) pkgHashDebugInfo
, opt "extra-lib-dirs" [] unwords pkgHashExtraLibDirs
, opt "extra-lib-dirs-static" [] unwords pkgHashExtraLibDirsStatic
, opt "extra-framework-dirs" [] unwords pkgHashExtraFrameworkDirs
, opt "extra-include-dirs" [] unwords pkgHashExtraIncludeDirs
, opt "prog-prefix" Nothing (maybe "" fromPathTemplate) pkgHashProgPrefix
Expand Down
1 change: 1 addition & 0 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 @@ -3915,6 +3915,7 @@ packageHashConfigInputs shared@ElaboratedSharedConfig{..} pkg =
pkgHashDebugInfo = elabDebugInfo,
pkgHashProgramArgs = elabProgramArgs,
pkgHashExtraLibDirs = elabExtraLibDirs,
pkgHashExtraLibDirsStatic = elabExtraLibDirsStatic,
pkgHashExtraFrameworkDirs = elabExtraFrameworkDirs,
pkgHashExtraIncludeDirs = elabExtraIncludeDirs,
pkgHashProgPrefix = elabProgPrefix,
Expand Down
4 changes: 4 additions & 0 deletions changelog.d/pr-7794
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
synopsis: Include extra-lib-dirs-static into PackageHash
packages: cabal-install
prs: #7794
issues: #6935