Merge pull request #6356 from haskell/issue-6334

Add regression test, and resolve #6334

cabal-install/Distribution/Client/SourceFiles.hs

@@ -17,7 +17,6 @@ import Distribution.Client.RebuildMonad
 
 import Distribution.Solver.Types.OptionalStanza
 
-import Distribution.Simple.Glob
 import Distribution.Simple.PreProcess
 
 import Distribution.Types.PackageDescription
@@ -34,14 +33,11 @@ import Distribution.Types.ForeignLib
 
 import Distribution.ModuleName
 
-import Distribution.Verbosity (silent)
-
 import Prelude ()
 import Distribution.Client.Compat.Prelude
 
 import System.FilePath
 import Control.Monad
-import Control.Monad.IO.Class
 import qualified Data.Set as Set
 
 needElaboratedConfiguredPackage :: ElaboratedConfiguredPackage -> Rebuild ()
@@ -156,9 +152,7 @@ needBuildInfo pkg_descr bi modules = do
     -- compilation).  It would be even better if we knew on a
     -- per-component basis which headers would be used but that
     -- seems to be too difficult.
-    forM_ (extraSrcFiles pkg_descr) $ \ glob -> do
-      files <- liftIO $ matchDirFileGlob silent (specVersion pkg_descr) "." glob
-      mapM_ needIfExists (filter ((==".h").takeExtension) files)
+    mapM_ needIfExists (filter ((==".h").takeExtension) (extraSrcFiles pkg_descr))
     forM_ (installIncludes bi) $ \f ->
         findFileMonitored ("." : includeDirs bi) f
             >>= maybe (return ()) need

cabal-testsuite/PackageTests/Regression/T6334/cabal.out

+# cabal v2-build
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - foo-0 (lib) (first run)
+Configuring library for foo-0..
+Preprocessing library for foo-0..
+Building library for foo-0..

cabal-testsuite/PackageTests/Regression/T6334/cabal.project

+packages: foo

cabal-testsuite/PackageTests/Regression/T6334/cabal.test.hs

+import Test.Cabal.Prelude
+main = cabalTest $
+  cabal "v2-build" ["all"]

cabal-testsuite/PackageTests/Regression/T6334/foo/README.md

+Some file

cabal-testsuite/PackageTests/Regression/T6334/foo/foo.cabal

+cabal-version: 2.2
+name: foo
+version: 0
+description:
+  https://github.com/haskell/cabal/issues/6334
+extra-source-files:
+  README.md
+
+library
+  default-language: Haskell2010
+  hs-source-dirs: src
+  exposed-modules: Foo
+  build-depends: base <5

cabal-testsuite/PackageTests/Regression/T6334/foo/src/Foo.hs

+module Foo () where