From dd4d42c2b998b2b95912ac04106fb7a9b1b0a57e Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Thu, 31 May 2001 21:23:20 +0000 Subject: Removed INSTALL_DIR and replaced it with DEVEL_PREFIX, ROOT_DIR, and TARGET_PREFIX to allow more flexibility. Also modified the gcc wrapper to do the right thing if -Wl,--dynamic-linker,xxx is passed on the command line. The gcc wrapper will also check the env variable UCLIBC_GCC_LDOPT for a dynamic linker option at runtime (although command line arg overrides the env variable). --- ldso/ldso/readelflib1.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'ldso/ldso/readelflib1.c') diff --git a/ldso/ldso/readelflib1.c b/ldso/ldso/readelflib1.c index 78ba9d0d2..a80aa0579 100644 --- a/ldso/ldso/readelflib1.c +++ b/ldso/ldso/readelflib1.c @@ -248,7 +248,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, #endif /* Check in /usr/lib */ - pnt1 = UCLIBC_INSTALL_DIR "/usr/lib/"; + pnt1 = UCLIBC_ROOT_DIR "/usr/lib/"; pnt = mylibname; while (*pnt1) *pnt++ = *pnt1++; @@ -261,33 +261,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, return tpnt1; /* Check in /lib */ - pnt1 = UCLIBC_INSTALL_DIR "/lib/"; - pnt = mylibname; - while (*pnt1) - *pnt++ = *pnt1++; - pnt1 = libname; - while (*pnt1) - *pnt++ = *pnt1++; - *pnt++ = 0; - tpnt1 = _dl_load_elf_shared_library(secure, mylibname, 0); - if (tpnt1) - return tpnt1; - - /* Check in /usr/lib */ - pnt1 = "/usr/lib/"; - pnt = mylibname; - while (*pnt1) - *pnt++ = *pnt1++; - pnt1 = libname; - while (*pnt1) - *pnt++ = *pnt1++; - *pnt++ = 0; - tpnt1 = _dl_load_elf_shared_library(secure, mylibname, 0); - if (tpnt1) - return tpnt1; - - /* Check in /lib */ - pnt1 = "/lib/"; + pnt1 = UCLIBC_ROOT_DIR "/lib/"; pnt = mylibname; while (*pnt1) *pnt++ = *pnt1++; -- cgit v1.2.3