Ticket #10639: 0001-runtime_loader-remove-an-erroneous-else-fixes-10539.patch

File 0001-runtime_loader-remove-an-erroneous-else-fixes-10539.patch, 1.2 KB (added by jessicah, 10 years ago)

  • src/system/runtime_loader/runtime_loader.cpp 

    From 0c9cb50fb3565d03d3796e23fa764f0de76136cd Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Wed, 5 Mar 2014 02:20:12 +0000
Subject: [PATCH] runtime_loader: remove an erroneous else, fixes #10639.

 * runtime_loader failed to locate libraries in an application
   folder following the ABI structure. E.g. WebPositive couldn't
   find libWebKit.so.1 inside lib/x86 on a gcc2h build.
---
 src/system/runtime_loader/runtime_loader.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/system/runtime_loader/runtime_loader.cpp b/src/system/runtime_loader/runtime_loader.cpp
index 16bb18f..5aaa51e 100644
    a b try_open_executable(const char *dir, int dirLength, const char *name,  
    170170                requestingObjectPath, buffer, pathLength, status)) {
    171171            if (status != B_OK)
    172172                return status;
    173         } else if (abiSpecificSubDir != NULL) {
     173        }
     174        if (abiSpecificSubDir != NULL) {
    174175            // We're looking for a library or an add-on and the executable has
    175176            // not been compiled with a compiler using the same ABI as the one
    176177            // the OS has been built with. Thus we only look in subdirs