i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Runtime loader: don't fall back to OS-ABI directories.

Browse Source 
* when an executable with a different ABI is being loaded and some
  needed image isn't found, don't retry using the standard ABI folders
  of the system - those are now considered incompatible
This commit is contained in:
Oliver Tappe
2013-06-05 18:32:47 +02:00
parent 9938009810
commit 0050b4b452
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/runtime_loader/runtime_loader.cpp
-7
View File
@@ -274,13 +274,6 @@ open_executable(char *name, image_type type, const char *rpath,
if (const char *paths = search_path_for_type(type)) { if (const char *paths = search_path_for_type(type)) {
fd = search_executable_in_path_list(name, paths, strlen(paths), fd = search_executable_in_path_list(name, paths, strlen(paths),
programPath, compatibilitySubDir, buffer, sizeof(buffer)); programPath, compatibilitySubDir, buffer, sizeof(buffer));
// If not found and a compatibility sub directory has been
// specified, look again in the standard search paths.
if (fd == B_ENTRY_NOT_FOUND && compatibilitySubDir != NULL) {
fd = search_executable_in_path_list(name, paths, strlen(paths),
programPath, NULL, buffer, sizeof(buffer));
}
} }
} }