mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix warning

Browse source
This commit is contained in:
Joey Hess 2014-01-14 16:44:04 -04:00
parent 207ac67aaa
commit 465a24cc54
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Build/OSXMkLibs.hs
View file

@ -109,7 +109,7 @@ expand_rpath libs replacement_libs cmd
let m = if (null s) let m = if (null s)
then M.fromList replacement_libs then M.fromList replacement_libs
else M.fromList $ mapMaybe parse $ lines s else M.fromList $ mapMaybe parse $ lines s
return $ map (replace m) libs return $ map (replacem m) libs
| otherwise = return libs | otherwise = return libs
where where
probe c = "DYLD_PRINT_RPATHS=1 " ++ c ++ " --getting-rpath-dummy-option 2>&1 | grep RPATH" probe c = "DYLD_PRINT_RPATHS=1 " ++ c ++ " --getting-rpath-dummy-option 2>&1 | grep RPATH"
@ -117,7 +117,7 @@ expand_rpath libs replacement_libs cmd
("RPATH":"successful":"expansion":"of":old:"to:":new:[]) -> ("RPATH":"successful":"expansion":"of":old:"to:":new:[]) ->
Just (old, new) Just (old, new)
_ -> Nothing _ -> Nothing
replace m l = fromMaybe l $ M.lookup l m replacem m l = fromMaybe l $ M.lookup l m
parseOtool :: String -> [FilePath] parseOtool :: String -> [FilePath]
parseOtool = catMaybes . map parse . lines parseOtool = catMaybes . map parse . lines