diff options
| -rw-r--r-- | extra/Configs/Config.in | 14 | ||||
| -rw-r--r-- | ldso/ldso/ldso.c | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 5ef2b9f14..22d67bc42 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -352,6 +352,20 @@ config LDSO_RUNPATH Usage of RUNPATH tags is not too common, so disabling this feature should be safe for most people. +config LDSO_SEARCH_INTERP_PATH + bool "Add ldso path to lib search path" + depends on HAVE_SHARED + default y + help + The ldso is told where it is being executed from and can use that + path to find related core libraries. This is useful by default, + but can be annoying in a mixed development environment. + + i.e. if the ldso is run from /foo/boo/ldso.so, it will start its + library search with /foo/boo/ + + If unsure, simply say Y here. + config UCLIBC_CTOR_DTOR bool "Support global constructors and destructors" default y diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 021f109cd..45d499574 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -490,6 +490,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, tpnt->libname = (char *) DL_RELOC_ADDR(app_tpnt->loadaddr, ppnt->p_vaddr); +#ifdef __LDSO_SEARCH_INTERP_PATH__ /* Store the path where the shared lib loader was found * for later use */ @@ -499,6 +500,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, *ptmp = '\0'; _dl_debug_early("Lib Loader: (%x) %s\n", (unsigned) DL_LOADADDR_BASE(tpnt->loadaddr), tpnt->libname); +#endif } /* Discover any TLS sections if the target supports them. */ |