diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
| commit | 425bc1107aebdb701cdcee44da731dd918cd470d (patch) | |
| tree | 25bcacb37277b70aa7bd0caaf0fe7c3edc665653 /Build/LinuxMkLibs.hs | |
| parent | 20c7644a4d85434cf49840ea92fca0c723710c72 (diff) | |
revert parentDir change
Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c
Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
Diffstat (limited to 'Build/LinuxMkLibs.hs')
| -rw-r--r-- | Build/LinuxMkLibs.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs index f3a7c3b2e..1ca2fa651 100644 --- a/Build/LinuxMkLibs.hs +++ b/Build/LinuxMkLibs.hs @@ -47,7 +47,7 @@ mklibs top = do writeFile (top </> "linker") (Prelude.head $ filter ("ld-linux" `isInfixOf`) libs') writeFile (top </> "gconvdir") - (takeDirectory $ Prelude.head $ filter ("/gconv/" `isInfixOf`) glibclibs) + (parentDir $ Prelude.head $ filter ("/gconv/" `isInfixOf`) glibclibs) mapM_ (installLinkerShim top) exes @@ -75,7 +75,7 @@ installLinkerShim top exe = do symToHardLink :: FilePath -> IO () symToHardLink f = whenM (isSymbolicLink <$> getSymbolicLinkStatus f) $ do l <- readSymbolicLink f - let absl = absPathFrom (takeDirectory f) l + let absl = absPathFrom (parentDir f) l nukeFile f createLink absl f @@ -84,7 +84,7 @@ installFile top f = do createDirectoryIfMissing True destdir void $ copyFileExternal CopyTimeStamps f destdir where - destdir = inTop top $ takeDirectory f + destdir = inTop top $ parentDir f checkExe :: FilePath -> IO Bool checkExe f |