diff --git a/cabal-install/src/Distribution/Client/PackageHash.hs b/cabal-install/src/Distribution/Client/PackageHash.hs index 067027db5412897d1c249b0dce7ac624717c24d1..30e495dbdf34ee29ee227cf9d00c1ddace410915 100644 --- a/cabal-install/src/Distribution/Client/PackageHash.hs +++ b/cabal-install/src/Distribution/Client/PackageHash.hs @@ -196,6 +196,7 @@ data PackageHashConfigInputs = PackageHashConfigInputs { pkgHashDebugInfo :: DebugInfoLevel, pkgHashProgramArgs :: Map String [String], pkgHashExtraLibDirs :: [FilePath], + pkgHashExtraLibDirsStatic :: [FilePath], pkgHashExtraFrameworkDirs :: [FilePath], pkgHashExtraIncludeDirs :: [FilePath], pkgHashProgPrefix :: Maybe PathTemplate, @@ -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 diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs index 594fec5b2d1fcef430440826b4ca8afc83d794fc..8f391c9ec994c242024bd7d3c40ce306abe53481 100644 --- a/cabal-install/src/Distribution/Client/ProjectPlanning.hs +++ b/cabal-install/src/Distribution/Client/ProjectPlanning.hs @@ -3915,6 +3915,7 @@ packageHashConfigInputs shared@ElaboratedSharedConfig{..} pkg = pkgHashDebugInfo = elabDebugInfo, pkgHashProgramArgs = elabProgramArgs, pkgHashExtraLibDirs = elabExtraLibDirs, + pkgHashExtraLibDirsStatic = elabExtraLibDirsStatic, pkgHashExtraFrameworkDirs = elabExtraFrameworkDirs, pkgHashExtraIncludeDirs = elabExtraIncludeDirs, pkgHashProgPrefix = elabProgPrefix, diff --git a/changelog.d/pr-7794 b/changelog.d/pr-7794 new file mode 100644 index 0000000000000000000000000000000000000000..744707b12556fc3f3398746d43bd49691c704057 --- /dev/null +++ b/changelog.d/pr-7794 @@ -0,0 +1,4 @@ +synopsis: Include extra-lib-dirs-static into PackageHash +packages: cabal-install +prs: #7794 +issues: #6935 \ No newline at end of file