Prepend hs-source-dir to match-component haskell#6622

fendor · Apr 5, 2020 · ec06b04 · ec06b04
1 parent 613a2a2
commit ec06b04
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/cabal-install/Distribution/Client/TargetSelector.hs b/cabal-install/Distribution/Client/TargetSelector.hs
@@ -2117,11 +2117,12 @@ matchComponentOtherFile :: [KnownComponent] -> String
                         -> Match (FilePath, KnownComponent)
 matchComponentOtherFile cs =
     matchFile
-      [ (file, c)
-      | c    <- cs
-      , file <- cinfoHsFiles c
-             ++ cinfoCFiles  c
-             ++ cinfoJsFiles c
+      [ (normalise (srcdir </> file), c)
+      | c      <- cs
+      , srcdir <- cinfoSrcDirs c
+      , file   <- cinfoHsFiles c
+               ++ cinfoCFiles  c
+               ++ cinfoJsFiles c
       ]