File tree 1 file changed +2
-3
lines changed
compiler/rustc_codegen_ssa/src/back
1 file changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -2688,9 +2688,6 @@ fn add_upstream_native_libraries(
2688
2688
// due to the paths including the current working directory. The linker command line
2689
2689
// needs to be deterministic since it appears inside the PDB file generated by the MSVC
2690
2690
// linker. See https://github.com/rust-lang/rust/issues/112586.
2691
- //
2692
- // Note that the `susroot_lib_path` returned by `target_filesearch().get_lib_path()` has
2693
- // already had `fix_windows_verbatim_for_gcc()` applied if needed.
2694
2691
fn rehome_sysroot_rlib_path < ' a > ( sess : & ' a Session , rlib_path : PathBuf ) -> PathBuf {
2695
2692
let sysroot_lib_path = sess. target_filesearch ( PathKind :: All ) . get_lib_path ( ) ;
2696
2693
let canonical_sysroot_lib_path =
@@ -2700,6 +2697,8 @@ fn rehome_sysroot_rlib_path<'a>(sess: &'a Session, rlib_path: PathBuf) -> PathBu
2700
2697
canonical_rlib_dir. pop ( ) ;
2701
2698
2702
2699
if canonical_rlib_dir == canonical_sysroot_lib_path {
2700
+ // The `susroot_lib_path` returned by `target_filesearch().get_lib_path()` has
2701
+ // already had `fix_windows_verbatim_for_gcc()` applied if needed.
2703
2702
sysroot_lib_path
2704
2703
. join ( rlib_path. file_name ( ) . expect ( "rlib path has no file name path component" ) )
2705
2704
} else {
You can’t perform that action at this time.
0 commit comments