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

assume @RPATH libs are present

Browse source 
Previous change caused them to be skipped. Probably when @RPATH is
included in the path, it's a path to a file that actually exists.

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2022-01-03 15:05:15 -04:00
parent 7e2f5edd68
commit 77048906a4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Build/OSXMkLibs.hs
View file

@ -106,7 +106,9 @@ otool appbase installedbins replacement_libs libmap = do
-- _inflateValidate symbol. So, avoid bundling libz unless -- _inflateValidate symbol. So, avoid bundling libz unless
-- this incompatability is resolved. -- this incompatability is resolved.
&& not ("libz." `isInfixOf` s) && not ("libz." `isInfixOf` s)
lib_present s = ifM (isJust <$> catchMaybeIO (getSymbolicLinkStatus s)) lib_present s
| "@rpath" `isInfixOf` s = return True
| otherwise = ifM (isJust <$> catchMaybeIO (getSymbolicLinkStatus s))
( return True ( return True
, do , do
hPutStrLn stderr $ "note: skipping library that is not present on disk: " ++ s hPutStrLn stderr $ "note: skipping library that is not present on disk: " ++ s