Rebase against 2b0977fc711e1faadfef69e3a46c2d1848b4826b.

This commit is contained in:
Zebediah Figura
2020-04-09 20:55:11 -05:00
parent 39678da196
commit f8c3c9a6f8
7 changed files with 75 additions and 97 deletions

View File

@@ -1,4 +1,4 @@
From 8a9fa77db1c92c62dc870727a19083400e8475ed Mon Sep 17 00:00:00 2001
From b17741a716e2633c02c2237eb424f126860a0c39 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 6 Oct 2014 05:06:06 +0200
Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -21,7 +21,7 @@ index 076c50323dd..ddb69c96dd4 100644
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index 5f92432d0e8..770fb051431 100644
index ab2a693ecaf..2add1025e39 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
@@ -29,9 +29,9 @@ index 5f92432d0e8..770fb051431 100644
ret = search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
+ || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf)
|| search_dll_path(filename, elf_load_file_cb, &load_elf);
|| search_dll_path(pcs, filename, elf_load_file_cb, &load_elf);
}
--
2.25.1
2.26.0