From f8a3fa0247f4ee4e614df73aef0f8732c8ae5ab3 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 4 Nov 2003 13:07:50 +0000 Subject: Rework the config system. Better utilize the Kconfig language which should simplify enabling arbitrary architectures. -Erik --- ldso/util/ldd.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ldso/util/ldd.c') diff --git a/ldso/util/ldd.c b/ldso/util/ldd.c index a73d34070..3ea41b424 100644 --- a/ldso/util/ldd.c +++ b/ldso/util/ldd.c @@ -215,7 +215,7 @@ int check_elf_header(Elf32_Ehdr *const ehdr) } /* This function's behavior must exactly match that - * in uClibc/ldso/d-link/readelflib1.c */ + * in uClibc/ldso/ldso/readelflib1.c */ static void search_for_named_library(char *name, char *result, const char *path_list) { int i, count = 1; @@ -322,11 +322,10 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru } /* Lastly, search the standard list of paths for the library. - This list must exactly match the list in uClibc/ldso/d-link/readelflib1.c */ - path = UCLIBC_TARGET_PREFIX "/usr/lib:" - UCLIBC_TARGET_PREFIX "/lib:" - UCLIBC_DEVEL_PREFIX "/lib:" - UCLIBC_BUILD_DIR "/lib:" + This list must exactly match the list in uClibc/ldso/ldso/readelflib1.c */ + path = UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:" + UCLIBC_RUNTIME_PREFIX "usr/lib:" + UCLIBC_RUNTIME_PREFIX "lib:" "/usr/lib:" "/lib"; search_for_named_library(lib->name, buf, path); -- cgit v1.2.3