steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-27 19:01:12 +01:00
Code Issues Packages Projects Releases 67 Wiki Activity

Merge pull request #453 from Sonicadvance1/32bit_searchpath

Browse Source 
Updates ELFSymbolDatabase for 32bit library paths
This commit is contained in:
Ryan Houdek authored and GitHub committed 2020-10-07 11:08:38 -07:00
2 parents 910de79701 36d9d9a7c5
commit 867955b9a0
1 file changed
+10 -3
Download Patch File Download Diff File Expand all files Collapse all files
External/SonicUtils/Source/ELFSymbolDatabase.cpp
Vendored
+10 -3
View File
@@ -13,9 +13,16 @@ namespace ELFLoader {
void ELFSymbolDatabase::FillLibrarySearchPaths() {
// XXX: Open /etc/ld.so.conf and parse the paths in that file
// For now I'm just filling with regular search paths
LibrarySearchPaths.emplace_back("/usr/local/lib/x86_64-linux-gnu");
LibrarySearchPaths.emplace_back("/lib/x86_64-linux-gnu");
LibrarySearchPaths.emplace_back("/usr/lib/x86_64-linux-gnu");
if (File->GetMode() == ELFContainer::MODE_64BIT) {
LibrarySearchPaths.emplace_back("/usr/local/lib/x86_64-linux-gnu");
LibrarySearchPaths.emplace_back("/lib/x86_64-linux-gnu");
LibrarySearchPaths.emplace_back("/usr/lib/x86_64-linux-gnu");
}
else {
LibrarySearchPaths.emplace_back("/usr/local/lib/i386-linux-gnu");
LibrarySearchPaths.emplace_back("/lib/i386-linux-gnu");
LibrarySearchPaths.emplace_back("/usr/lib/i386-linux-gnu");
}
// At least we can scan LD_LIBRARY_PATH
auto EnvVar = getenv("LD_LIBRARY_PATH");