|
@@ -266,6 +266,18 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
|
|
|
if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL)
|
|
|
return tpnt1;
|
|
|
}
|
|
|
+#ifdef __LDSO_RUNPATH_OF_EXECUTABLE__
|
|
|
+ /*
|
|
|
+ * Try the DT_RPATH of the executable itself.
|
|
|
+ */
|
|
|
+ pnt = (char *) _dl_loaded_modules->dynamic_info[DT_RPATH];
|
|
|
+ if (pnt) {
|
|
|
+ pnt += (unsigned long) _dl_loaded_modules->dynamic_info[DT_STRTAB];
|
|
|
+ _dl_if_debug_dprint("\tsearching exe's RPATH='%s'\n", pnt);
|
|
|
+ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
|
|
|
+ return tpnt1;
|
|
|
+ }
|
|
|
+#endif
|
|
|
#endif
|
|
|
|
|
|
/*
|