[PATCH 3/3] dbghelp: Provide a default value for DYLD_FALLBACK_LIBRARY_PATH, which is closer to how dyld behaves.
Ken Thomases
ken at codeweavers.com
Thu Sep 17 21:26:38 CDT 2015
---
dlls/dbghelp/macho_module.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c
index 1352870..1f5d446 100644
--- a/dlls/dbghelp/macho_module.c
+++ b/dlls/dbghelp/macho_module.c
@@ -1571,8 +1571,10 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam
/* Try DYLD_FALLBACK_LIBRARY_PATH, with just the filename (no directories). */
if (!ret)
{
- ret = macho_load_file_from_path(pcs, p, load_addr,
- getenv("DYLD_FALLBACK_LIBRARY_PATH"), macho_info);
+ const char* fallback = getenv("DYLD_FALLBACK_LIBRARY_PATH");
+ if (!fallback)
+ fallback = "/usr/local/lib:/lib:/usr/lib";
+ ret = macho_load_file_from_path(pcs, p, load_addr, fallback, macho_info);
}
if (!ret && !strchrW(filename, '/'))
ret = macho_load_file_from_dll_path(pcs, filename, load_addr, macho_info);
--
2.4.3
More information about the wine-patches
mailing list