Commit d6fd6feb authored by Andrey Mokhov's avatar Andrey Mokhov

Fix libffil build

See #426
parent 18539d0c
...@@ -64,7 +64,7 @@ libffiRules = do ...@@ -64,7 +64,7 @@ libffiRules = do
libffiPath <- libffiBuildPath libffiPath <- libffiBuildPath
build $ target libffiContext (Make libffiPath) [] [] build $ target libffiContext (Make libffiPath) [] []
hs <- getDirectoryFiles "" [libffiPath -/- "inst/lib/*/include/*"] hs <- getDirectoryFiles "" [libffiPath -/- "inst/include/*"]
forM_ hs $ \header -> forM_ hs $ \header ->
copyFile header (rtsPath -/- takeFileName header) copyFile header (rtsPath -/- takeFileName header)
...@@ -82,7 +82,8 @@ libffiRules = do ...@@ -82,7 +82,8 @@ libffiRules = do
<$> getDirectoryFiles "" ["libffi-tarballs/libffi*.tar.gz"] <$> getDirectoryFiles "" ["libffi-tarballs/libffi*.tar.gz"]
need [tarball] 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 root <- buildRoot
removeDirectory (root -/- libname) removeDirectory (root -/- libname)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment