bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #138404 - bjorn3:sysroot_handling_cleanup, r=petrochenkov,jieyouxu

Browse source 
Cleanup sysroot locating a bit

All commits should preserve existing behavior.
This commit is contained in:
Matthias Krüger 2025-03-13 11:28:35 +01:00 • committed by GitHub
commit ad23e9d705
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 42 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -1286,8 +1286,7 @@ fn link_sanitizer_runtime(
if path.exists() {
sess.target_tlib_path.dir.clone()
} else {
let default_sysroot =
filesearch::get_or_default_sysroot().expect("Failed finding sysroot");
let default_sysroot = filesearch::get_or_default_sysroot();
let default_tlib =
filesearch::make_target_lib_path(&default_sysroot, sess.opts.target_triple.tuple());
default_tlib