diff options
| author | bors <bors@rust-lang.org> | 2025-03-13 13:34:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-13 13:34:28 +0000 |
| commit | 93257e2d20809d82d1bc0fcc1942480d1a66d7cd (patch) | |
| tree | a6f70ef26c0dd07c8cf656e746e0ff23ec4cb94f /compiler/rustc_codegen_ssa/src/back | |
| parent | a2aba0578ba440130d2ee213fc9dfdaa7095bdb5 (diff) | |
| parent | ad23e9d705a42cefee332c1a5a0f405856968ddb (diff) | |
| download | rust-93257e2d20809d82d1bc0fcc1942480d1a66d7cd.tar.gz rust-93257e2d20809d82d1bc0fcc1942480d1a66d7cd.zip | |
Auto merge of #138450 - matthiaskrgr:rollup-4im25vf, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #137816 (attempt to support `BinaryFormat::Xcoff` in `naked_asm!`) - #138109 (make precise capturing args in rustdoc Json typed) - #138343 (Enable `f16` tests for `powf`) - #138356 (bump libc to 0.2.171 to fix xous) - #138371 (Update compiletest's `has_asm_support` to match rustc) - #138404 (Cleanup sysroot locating a bit) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 0ac0ad46295..ea961f222db 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1288,8 +1288,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 |