diff options
| author | pk <pk@NetBSD.org> | 1994-02-15 22:51:23 +0000 |
|---|---|---|
| committer | pk <pk@NetBSD.org> | 1994-02-15 22:51:23 +0000 |
| commit | 1bb4f06e2a35d10ff8372a8321ef3adab2db4b63 (patch) | |
| tree | 720f347c2006fddfaf3a090b9bd2ecd374e30b57 /libexec | |
| parent | bc47f533d5dd170f0036f78eeb573bde1e3a355b (diff) | |
Libraries which are in the hints file but not in one's LD_LIBRARY_PATH (if
set) were not found.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.aout_so/rtld.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libexec/ld.aout_so/rtld.c b/libexec/ld.aout_so/rtld.c index ebf7ec92ff1..e0335dba179 100644 --- a/libexec/ld.aout_so/rtld.c +++ b/libexec/ld.aout_so/rtld.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.14 1994/01/29 02:03:39 jtc Exp $ + * $Id: rtld.c,v 1.15 1994/02/15 22:51:23 pk Exp $ */ #include <sys/param.h> @@ -1073,13 +1073,17 @@ rtfindlib(name, major, minor, usehints) if (hint) return hint; } - } else { - /* No LD_LIBRARY_PATH, check default */ - hint = findhint(name, major, minor, NULL); + /* Not found in hints, try directory search */ + hint = (char *)findshlib(name, &major, &minor, 0); if (hint) return hint; } + /* No LD_LIBRARY_PATH or lib not found in there; check default */ + hint = findhint(name, major, minor, NULL); + if (hint) + return hint; + /* No hints available for name */ *usehints = 0; return (char *)findshlib(name, &major, &minor, 0); |
