diff options
Diffstat (limited to 'hadrian/src/Rules')
| -rw-r--r-- | hadrian/src/Rules/Rts.hs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/hadrian/src/Rules/Rts.hs b/hadrian/src/Rules/Rts.hs index 3e0c94f24d..efcd5f614a 100644 --- a/hadrian/src/Rules/Rts.hs +++ b/hadrian/src/Rules/Rts.hs @@ -17,11 +17,9 @@ rtsRules = priority 3 $ do root -/- "**/libHSrts_*-ghc*.dylib", root -/- "**/libHSrts-ghc*.so", root -/- "**/libHSrts-ghc*.dylib"] - |%> \ rtsLibFilePath' -> do - let (dir, name) = splitFileName rtsLibFilePath' - createFileLink - (dir -/- (addRtsDummyVersion name)) - rtsLibFilePath' + |%> \ rtsLibFilePath' -> createFileLink + (addRtsDummyVersion $ takeFileName rtsLibFilePath') + rtsLibFilePath' -- Libffi forM_ [Stage1 ..] $ \ stage -> do @@ -65,8 +63,7 @@ copyLibffiStatic stage target = withLibffi stage $ \ libffiPath _ -> do vanillaLibFile <- rtsLibffiLibrary stage vanilla if target == vanillaLibFile then copyFile' (libffiPath -/- libffiLibrary) target - else do - createFileLink (takeDirectory target -/- takeFileName vanillaLibFile) target + else createFileLink (takeFileName vanillaLibFile) target -- | Copy a dynamic library file from the libffi build dir to the rts build dir. @@ -91,7 +88,7 @@ copyLibffiDynamicUnix stage libSuf target = do , "-id", "@rpath/" ++ takeFileName target , target ] - else createFileLink (takeDirectory target -/- versionlessSourceFileName) target + else createFileLink versionlessSourceFileName target -- | Copy a dynamic library file from the libffi build dir to the rts build dir. copyLibffiDynamicWin :: Stage -> FilePath -> Action () |