[commit: ghc] wip/nfs-locking: Simplify extraObjects in src/Rules/Library.hs, see #117. (ce8ffdb)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:57:05 UTC 2017


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

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

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

commit ce8ffdbbb7d477d022f5df20e77467413f80349b
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 6 11:10:49 2016 +0000

    Simplify extraObjects in src/Rules/Library.hs, see #117.


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

ce8ffdbbb7d477d022f5df20e77467413f80349b
 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 41e7b3d..46f3971 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -80,9 +80,5 @@ extraObjects :: PartialTarget -> Action [FilePath]
 extraObjects (PartialTarget _ pkg)
     | pkg == integerGmp = do
         need [integerGmpLibraryH]
-        objsExist <- doesDirectoryExist integerGmpObjects
-        putBuild $ "objsExist = " ++ show objsExist
-        if objsExist
-        then getDirectoryFiles "" [integerGmpObjects -/- "*.o"]
-        else return []
+        getDirectoryFiles "" [integerGmpObjects -/- "*.o"]
     | otherwise         = return []



More information about the ghc-commits mailing list