Merge pull request #7767 from haskell/mergify/bp/3.6/pr-7608

glob expand extra-src-files when tracking for rebuild (backport #7608)

cabal-install/src/Distribution/Client/SourceFiles.hs

@@ -12,11 +12,14 @@
 -- we cannot "see" easily.
 module Distribution.Client.SourceFiles (needElaboratedConfiguredPackage) where
 
+import Control.Monad.IO.Class
+
 import Distribution.Client.ProjectPlanning.Types
 import Distribution.Client.RebuildMonad
 
 import Distribution.Solver.Types.OptionalStanza
 
+import Distribution.Simple.Glob (matchDirFileGlobWithDie)
 import Distribution.Simple.PreProcess
 
 import Distribution.Types.PackageDescription
@@ -35,6 +38,7 @@ import Distribution.ModuleName
 
 import Prelude ()
 import Distribution.Client.Compat.Prelude
+import Distribution.Verbosity (silent)
 
 import System.FilePath
 
@@ -138,13 +142,14 @@ needBuildInfo pkg_descr bi modules = do
     -- A.hs-boot; need to track both.
     findNeededModules ["hs", "lhs", "hsig", "lhsig"]
     findNeededModules ["hs-boot", "lhs-boot"]
+    expandedExtraSrcFiles <- liftIO $ fmap concat . for (extraSrcFiles pkg_descr) $ \fpath -> matchDirFileGlobWithDie silent (\ _ _ -> return []) (specVersion pkg_descr) "." fpath
     traverse_ needIfExists $ concat
         [ cSources bi
         , cxxSources bi
         , jsSources bi
         , cmmSources bi
         , asmSources bi
-        , extraSrcFiles pkg_descr
+        , expandedExtraSrcFiles
         ]
     for_ (installIncludes bi) $ \f ->
         findFileMonitored ("." : includeDirs bi) f

changelog.d/pr-7608

@@ -0,0 +1,10 @@
+synopsis: Glob expand extra-source-files when tracking for rebuild
+packages: cabal-install
+prs: #7608
+issues: #4746
+
+description: {
+
+- Since 3.4, extra-source-files have been tracked by cabal-install in the rebuild-checking logic. However, this tracking did not, until this PR, take into account glob-expansion.
+
+}