[Git][ghc/ghc][master] Hadrian: fix libffi tarball parsing

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
b4a929a1 by Sylvain Henry at 2020-12-11T22:41:30-05:00
Hadrian: fix libffi tarball parsing

Fix parsing of "libffi-3.3.tar.gz".

NB: switch to a newer libffi isn't done in this patch

- - - - -


1 changed file:

- hadrian/src/Rules/Libffi.hs


Changes:

=====================================
hadrian/src/Rules/Libffi.hs
=====================================
@@ -190,7 +190,7 @@ libffiRules = do
         removeDirectory libffiPath
         tarball <- needLibfffiArchive libffiPath
         -- Go from 'libffi-3.99999+git20171002+77e130c.tar.gz' to 'libffi-3.99999'
-        let libname = takeWhile (/= '+') $ takeFileName tarball
+        let libname = takeWhile (/= '+') $ fromJust $ stripExtension "tar.gz" $ takeFileName tarball
 
         -- Move extracted directory to libffiPath.
         root <- buildRoot



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b4a929a1e54272ff6ba67c1a2baba635bae93b0b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b4a929a1e54272ff6ba67c1a2baba635bae93b0b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201211/8750e464/attachment-0001.html>