From b7c5599d22018ab6be88442c4668bc1697f85b8e Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Mon, 10 May 2021 19:15:19 +0300 Subject: Adjust target search algorithm for rustlib path With this the concerns expressed in #83800 should be addressed. --- compiler/rustc_codegen_ssa/src/back/link.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/rustc_codegen_ssa/src') diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 59f66c55572..30a56badeb5 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1576,7 +1576,7 @@ fn add_rpath_args( let target_triple = sess.opts.target_triple.triple(); let mut get_install_prefix_lib_path = || { let install_prefix = option_env!("CFG_PREFIX").expect("CFG_PREFIX"); - let tlib = filesearch::relative_target_lib_path(&sess.sysroot, target_triple); + let tlib = rustc_target::target_rustlib_path(&sess.sysroot, target_triple).join("lib"); let mut path = PathBuf::from(install_prefix); path.push(&tlib); -- cgit 1.4.1-3-g733a5