From 3e3753c1a8e047dc84f9db1dc26bb046cff457a6 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 2 Aug 2013 10:02:29 -0400 Subject: move RPATH search after LD_LIBRARY_PATH search this is the modern way, and the only way that makes any sense. glibc has this complicated mechanism with RPATH and RUNPATH that controls whether RPATH is processed before or after LD_LIBRARY_PATH, presumably to support legacy binaries, but there is no compelling reason to support this, and better behavior is obtained by just fixing the search order. --- src/ldso/dynlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ldso') diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index ff99489a..d689f96e 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -517,8 +517,8 @@ static struct dso *load_library(const char *name) } if (strlen(name) > NAME_MAX) return 0; fd = -1; - if (r_path) fd = path_open(name, r_path, buf, sizeof buf); - if (fd < 0 && env_path) fd = path_open(name, env_path, buf, sizeof buf); + if (env_path) fd = path_open(name, env_path, buf, sizeof buf); + if (fd < 0 && r_path) fd = path_open(name, r_path, buf, sizeof buf); if (fd < 0) { if (!sys_path) { char *prefix = 0; -- cgit v1.2.1