From 0050b4b4521cdb9dee167ff687f426d3eea33ec5 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 5 Jun 2013 18:11:46 +0200 Subject: [PATCH] Runtime loader: don't fall back to OS-ABI directories. * 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 --- src/system/runtime_loader/runtime_loader.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/system/runtime_loader/runtime_loader.cpp b/src/system/runtime_loader/runtime_loader.cpp index 340e0db559..1f5ba6f985 100644 --- a/src/system/runtime_loader/runtime_loader.cpp +++ b/src/system/runtime_loader/runtime_loader.cpp @@ -274,13 +274,6 @@ open_executable(char *name, image_type type, const char *rpath, if (const char *paths = search_path_for_type(type)) { fd = search_executable_in_path_list(name, paths, strlen(paths), 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)); - } } }