assume @RPATH libs are present

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

diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs
index 2adf3c61a2db3695d30f51a4f2b391b20a42e737..aadd9519ed3f131344477c30a2b94c2d2b79dc3b 100644 (file)
--- a/Build/OSXMkLibs.hs
+++ b/Build/OSXMkLibs.hs
@@ -106,12 +106,14 @@ otool appbase installedbins replacement_libs libmap = do
                -- _inflateValidate symbol. So, avoid bundling libz unless
                -- this incompatability is resolved.
                && not ("libz." `isInfixOf` s)
-       lib_present s = ifM (isJust <$> catchMaybeIO (getSymbolicLinkStatus s))
-               ( return True
-               , do
-                       hPutStrLn stderr $ "note: skipping library that is not present on disk: " ++ s
-                       return False
-               )
+       lib_present s
+               | "@rpath" `isInfixOf` s = return True
+               | otherwise = ifM (isJust <$> catchMaybeIO (getSymbolicLinkStatus s))
+                       ( return True
+                       , do
+                               hPutStrLn stderr $ "note: skipping library that is not present on disk: " ++ s
+                               return False
+                       )
        process c [] rls m = return (nub $ concat c, rls, m)
        process c (file:rest) rls m = do
                _ <- boolSystem "chmod" [Param "755", File file]