From dbe235e5d85a9e1ea5d987a8fb0f2f15e0f03c65 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Tue, 28 Sep 2004 07:56:49 +0000 Subject: Remove /usr/X11R6/lib from search path. Search in UCLIBC_RUNTIME_PREFIX"lib" before UCLIBC_RUNTIME_PREFIX"usr/lib". X11 users should enable USE_CACHE in Rules.mak, add /usr/X11R6/lib to /etc/ld.so.conf and run ldconfig. --- ldso/ldso/dl-elf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index c58ca5dfb..019acaac8 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -356,12 +356,9 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, if(_dl_debug) _dl_dprintf(_dl_debug_file, "\tsearching full lib path list\n"); #endif if ((tpnt1 = search_for_named_library(libname, secure, - UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:" - UCLIBC_RUNTIME_PREFIX "usr/lib:" UCLIBC_RUNTIME_PREFIX "lib:" - "/usr/X11R6/lib:" - "/usr/lib:" - "/lib", rpnt) + UCLIBC_RUNTIME_PREFIX "usr/lib" + , rpnt) ) != NULL) { return tpnt1; -- cgit v1.2.3