summaryrefslogtreecommitdiff
path: root/hadrian
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-11-26 12:01:46 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-12-11 22:41:30 -0500
commitb4a929a1e54272ff6ba67c1a2baba635bae93b0b (patch)
tree68269d9b062d742a4eff3db84f9dacc0639a211c /hadrian
parentaaa8f00fa03dbc29511283f93fde3b627023f4fe (diff)
downloadhaskell-b4a929a1e54272ff6ba67c1a2baba635bae93b0b.tar.gz
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
Diffstat (limited to 'hadrian')
-rw-r--r--hadrian/src/Rules/Libffi.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/src/Rules/Libffi.hs b/hadrian/src/Rules/Libffi.hs
index 75ac1aa6ba..86238c30a4 100644
--- a/hadrian/src/Rules/Libffi.hs
+++ b/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