[commit: ghc] wip/nfs-locking: Drop workaround a Shake getDirectoryFiles bug. (ab5a70f)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:26:32 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/ab5a70fd6fe2e175749b6c55b6395871fe069c77/ghc

>---------------------------------------------------------------

commit ab5a70fd6fe2e175749b6c55b6395871fe069c77
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Apr 26 01:28:55 2016 +0100

    Drop workaround a Shake getDirectoryFiles bug.


>---------------------------------------------------------------

ab5a70fd6fe2e175749b6c55b6395871fe069c77
 src/Rules/Library.hs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index b74baf8..8e09162 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -97,9 +97,5 @@ extraObjects :: Context -> Action [FilePath]
 extraObjects (Context _ package _)
     | package == integerGmp = do
         orderOnly [gmpLibraryH] -- TODO: move this dependency elsewhere, #113?
-        -- FIXME: simplify after Shake's getDirectoryFiles bug is fixed, #168
-        exists <- doesDirectoryExist gmpObjects
-        if exists
-        then map unifyPath <$> getDirectoryFiles "" [gmpObjects -/- "*.o"]
-        else return []
+        map unifyPath <$> getDirectoryFiles "" [gmpObjects -/- "*.o"]
     | otherwise         = return []



More information about the ghc-commits mailing list