From 94f3113bc0fd4625e7547e8d9b8853dc7d482658 Mon Sep 17 00:00:00 2001 From: Alex Biehl Date: Wed, 3 Nov 2021 12:08:31 +0100 Subject: [PATCH] Include extra-lib-dirs-static into PackageHash --- cabal-install/src/Distribution/Client/PackageHash.hs | 2 ++ cabal-install/src/Distribution/Client/ProjectPlanning.hs | 1 + 2 files changed, 3 insertions(+) diff --git a/cabal-install/src/Distribution/Client/PackageHash.hs b/cabal-install/src/Distribution/Client/PackageHash.hs index b3c0adc0be0..9fad219fcd5 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, @@ -289,6 +290,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 906f56d222b..9c1cb22ba2e 100644 --- a/cabal-install/src/Distribution/Client/ProjectPlanning.hs +++ b/cabal-install/src/Distribution/Client/ProjectPlanning.hs @@ -3869,6 +3869,7 @@ packageHashConfigInputs shared@ElaboratedSharedConfig{..} pkg = pkgHashDebugInfo = elabDebugInfo, pkgHashProgramArgs = elabProgramArgs, pkgHashExtraLibDirs = elabExtraLibDirs, + pkgHashExtraLibDirsStatic = elabExtraLibDirsStatic, pkgHashExtraFrameworkDirs = elabExtraFrameworkDirs, pkgHashExtraIncludeDirs = elabExtraIncludeDirs, pkgHashProgPrefix = elabProgPrefix,