diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-03-18 11:17:14 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-03-18 11:17:14 +0000 |
| commit | 0c91a787b60e3a8804c1001724b039a0b80c7bb4 (patch) | |
| tree | 631cac9fbc9da889ad6015dfbecd14a340742306 | |
| parent | e32376aaed01ed44981386e348ac35b58da23495 (diff) | |
Look in /usr/X11R6/lib as well
| -rw-r--r-- | ldso/ldso/dl-elf.c | 2 | ||||
| -rw-r--r-- | utils/ldd.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 8a3fa6d20..3341fdd80 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -358,6 +358,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:" UCLIBC_RUNTIME_PREFIX "usr/lib:" UCLIBC_RUNTIME_PREFIX "lib:" + "/usr/X11R6/lib:" "/usr/lib:" "/lib", rpnt) ) != NULL) @@ -924,4 +925,3 @@ void *_dl_malloc(int size) } - diff --git a/utils/ldd.c b/utils/ldd.c index 777a99382..977ce8b2c 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -341,6 +341,7 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru path = UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:" UCLIBC_RUNTIME_PREFIX "usr/lib:" UCLIBC_RUNTIME_PREFIX "lib:" + "/usr/X11R6/lib:" "/usr/lib:" "/lib"; search_for_named_library(lib->name, buf, path); |