[commit: ghc] wip/nfs-locking: Fix libffil build (d6fd6fe)

[git at git.haskell.org]

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

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

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

commit d6fd6feb85cd846dfd707703da839056d43c92a8
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Oct 5 10:50:56 2017 +0100

    Fix libffil build
    
    See #426


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

d6fd6feb85cd846dfd707703da839056d43c92a8
 src/Rules/Libffi.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Rules/Libffi.hs b/src/Rules/Libffi.hs
index 68040be..9641b66 100644
--- a/src/Rules/Libffi.hs
+++ b/src/Rules/Libffi.hs
@@ -64,7 +64,7 @@ libffiRules = do
             libffiPath <- libffiBuildPath
             build $ target libffiContext (Make libffiPath) [] []
 
-            hs <- getDirectoryFiles "" [libffiPath -/- "inst/lib/*/include/*"]
+            hs <- getDirectoryFiles "" [libffiPath -/- "inst/include/*"]
             forM_ hs $ \header ->
                 copyFile header (rtsPath -/- takeFileName header)
 
@@ -82,7 +82,8 @@ libffiRules = do
                <$> getDirectoryFiles "" ["libffi-tarballs/libffi*.tar.gz"]
 
         need [tarball]
-        let libname = dropExtension . dropExtension $ takeFileName tarball
+        -- Go from 'libffi-3.99999+git20171002+77e130c.tar.gz' to 'libffi-3.99999'
+        let libname = takeWhile (/= '+') $ takeFileName tarball
 
         root <- buildRoot
         removeDirectory (root -/- libname)