diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-10-06 07:34:17 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-10-06 07:34:17 +0000 |
| commit | 9f9ab4922338d58f5adf8353286039eae09e1c2f (patch) | |
| tree | a9149db236c6d220b3fd10c72855ea1a720292e1 /utils/ldd.c | |
| parent | e93138024a06eab6edeaa542c4660d246ef2cfce (diff) | |
Puts common defines into dl-defs.h (in ldso/include) from dl-elf.h and
dl-cache.h and make use of it. Also disables the lib-path-redundancy check
for the case the cache is not used. Makes use of _PRELOAD_FILE_SUPPORT.
From Peter Mazinger.
Diffstat (limited to 'utils/ldd.c')
| -rw-r--r-- | utils/ldd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/ldd.c b/utils/ldd.c index cc50109fc..a4877e31a 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -45,7 +45,7 @@ #else #include "elf.h" #endif -#include "dl-cache.h" +#include "dl-defs.h" #ifdef DMALLOC #include <dmalloc.h> @@ -439,7 +439,7 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru This list must exactly match the list in uClibc/ldso/ldso/dl-elf.c */ path = UCLIBC_RUNTIME_PREFIX "lib:" UCLIBC_RUNTIME_PREFIX "usr/lib" -#if !defined (__LDSO_CACHE_SUPPORT__) +#ifndef __LDSO_CACHE_SUPPORT__ ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib" #endif ; |