浏览代码

Look in /usr/X11R6/lib as well

Eric Andersen 21 年之前
父节点
当前提交
0c91a787b6
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      ldso/ldso/dl-elf.c
  2. 1 0
      utils/ldd.c

+ 1 - 1
ldso/ldso/dl-elf.c

@@ -358,6 +358,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
 					UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:"
 					UCLIBC_RUNTIME_PREFIX "usr/lib:"
 					UCLIBC_RUNTIME_PREFIX "lib:"
+					"/usr/X11R6/lib:"
 					"/usr/lib:"
 					"/lib", rpnt)
 		) != NULL)
@@ -924,4 +925,3 @@ void *_dl_malloc(int size)
 }
 
 
-

+ 1 - 0
utils/ldd.c

@@ -341,6 +341,7 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru
 	path =	UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:"
 		UCLIBC_RUNTIME_PREFIX "usr/lib:"
 		UCLIBC_RUNTIME_PREFIX "lib:"
+		"/usr/X11R6/lib:"
 		"/usr/lib:"
 		"/lib";
 	search_for_named_library(lib->name, buf, path);