diff --git a/cabal-install/Distribution/Client/SourceFiles.hs b/cabal-install/Distribution/Client/SourceFiles.hs index 1e74f8baef137ad2a26b8768590a680d685849a9..fdd51abb77b84a0d7833113dbb8f1984f1224c25 100644 --- a/cabal-install/Distribution/Client/SourceFiles.hs +++ b/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 diff --git a/cabal-testsuite/PackageTests/Regression/T6334/cabal.out b/cabal-testsuite/PackageTests/Regression/T6334/cabal.out new file mode 100644 index 0000000000000000000000000000000000000000..255f6d4690b3f0982b2bc0c22145fc9a0f792716 --- /dev/null +++ b/cabal-testsuite/PackageTests/Regression/T6334/cabal.out @@ -0,0 +1,8 @@ +# 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.. diff --git a/cabal-testsuite/PackageTests/Regression/T6334/cabal.project b/cabal-testsuite/PackageTests/Regression/T6334/cabal.project new file mode 100644 index 0000000000000000000000000000000000000000..e63723e9dc92e9e29293201169f0196f83ff0bce --- /dev/null +++ b/cabal-testsuite/PackageTests/Regression/T6334/cabal.project @@ -0,0 +1 @@ +packages: foo diff --git a/cabal-testsuite/PackageTests/Regression/T6334/cabal.test.hs b/cabal-testsuite/PackageTests/Regression/T6334/cabal.test.hs new file mode 100644 index 0000000000000000000000000000000000000000..1adfcadf4534c9c92eb1cb8d8a0d24943cead835 --- /dev/null +++ b/cabal-testsuite/PackageTests/Regression/T6334/cabal.test.hs @@ -0,0 +1,3 @@ +import Test.Cabal.Prelude +main = cabalTest $ + cabal "v2-build" ["all"] diff --git a/cabal-testsuite/PackageTests/Regression/T6334/foo/README.md b/cabal-testsuite/PackageTests/Regression/T6334/foo/README.md new file mode 100644 index 0000000000000000000000000000000000000000..82ece4fb23f4fc084ea53f3861ffa39eda49c4fb --- /dev/null +++ b/cabal-testsuite/PackageTests/Regression/T6334/foo/README.md @@ -0,0 +1 @@ +Some file diff --git a/cabal-testsuite/PackageTests/Regression/T6334/foo/foo.cabal b/cabal-testsuite/PackageTests/Regression/T6334/foo/foo.cabal new file mode 100644 index 0000000000000000000000000000000000000000..d6e03d8201ced4a744db38a345b9df85183cd25f --- /dev/null +++ b/cabal-testsuite/PackageTests/Regression/T6334/foo/foo.cabal @@ -0,0 +1,13 @@ +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 diff --git a/cabal-testsuite/PackageTests/Regression/T6334/foo/src/Foo.hs b/cabal-testsuite/PackageTests/Regression/T6334/foo/src/Foo.hs new file mode 100644 index 0000000000000000000000000000000000000000..42e29cbf36e7f8636f28c1044a561ad7ac0a7bd1 --- /dev/null +++ b/cabal-testsuite/PackageTests/Regression/T6334/foo/src/Foo.hs @@ -0,0 +1 @@ +module Foo () where