diff options
| author | jdp <jdp@FreeBSD.org> | 1999-04-09 06:42:00 +0000 |
|---|---|---|
| committer | jdp <jdp@FreeBSD.org> | 1999-04-09 06:42:00 +0000 |
| commit | 9dd48e58c35657d065e324a437dc2d8d77a28490 (patch) | |
| tree | 003573a526a0231b0e66d60086524857b51f2ca7 /libexec/rtld-elf | |
| parent | 2aba902430d83205168847d9ef6a039d5f3fa5c9 (diff) | |
| download | FreeBSD-src-9dd48e58c35657d065e324a437dc2d8d77a28490.zip FreeBSD-src-9dd48e58c35657d065e324a437dc2d8d77a28490.tar.gz | |
The ELF specification says that the RPATH in the executable or
shared object takes precedence over LD_LIBRARY_PATH. Make the
dynamic linker do it that way.
Diffstat (limited to 'libexec/rtld-elf')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8aff91c..7196575 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.19 1999/04/07 02:48:43 jdp Exp $ + * $Id: rtld.c,v 1.20 1999/04/09 00:28:31 jdp Exp $ */ /* @@ -659,10 +659,10 @@ find_library(const char *name, const Obj_Entry *refobj) dbg(" Searching for \"%s\"", name); - if ((pathname = search_library_path(name, ld_library_path)) != NULL || - (pathname = search_library_path(name, gethints())) != NULL || - (refobj != NULL && + if ((refobj != NULL && (pathname = search_library_path(name, refobj->rpath)) != NULL) || + (pathname = search_library_path(name, ld_library_path)) != NULL || + (pathname = search_library_path(name, gethints())) != NULL || (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL) return pathname; |
