@@ -1273,7 +1273,7 @@ fn link_sanitizer_runtime(
1273
1273
} else {
1274
1274
let filename = format ! ( "librustc{channel}_rt.{name}.a" ) ;
1275
1275
let path = find_sanitizer_runtime ( sess, & filename) . join ( & filename) ;
1276
- linker. link_whole_rlib ( & path) ;
1276
+ linker. link_whole_staticlib_by_path ( & path) ;
1277
1277
}
1278
1278
}
1279
1279
@@ -2506,20 +2506,20 @@ fn add_native_libs_from_crate(
2506
2506
// If rlib contains native libs as archives, they are unpacked to tmpdir.
2507
2507
let path = tmpdir. join ( filename. as_str ( ) ) ;
2508
2508
if whole_archive {
2509
- cmd. link_whole_rlib ( & path) ;
2509
+ cmd. link_whole_staticlib_by_path ( & path) ;
2510
2510
} else {
2511
- cmd. link_rlib ( & path) ;
2511
+ cmd. link_staticlib_by_path ( & path) ;
2512
2512
}
2513
2513
}
2514
2514
} else {
2515
2515
if whole_archive {
2516
- cmd. link_whole_staticlib (
2516
+ cmd. link_whole_staticlib_by_name (
2517
2517
name,
2518
2518
verbatim,
2519
2519
search_paths. get_or_init ( || archive_search_paths ( sess) ) ,
2520
2520
) ;
2521
2521
} else {
2522
- cmd. link_staticlib ( name, verbatim)
2522
+ cmd. link_staticlib_by_name ( name, verbatim)
2523
2523
}
2524
2524
}
2525
2525
}
@@ -2534,7 +2534,7 @@ fn add_native_libs_from_crate(
2534
2534
// link kind is unspecified.
2535
2535
if !link_output_kind. can_link_dylib ( ) && !sess. target . crt_static_allows_dylibs {
2536
2536
if link_static {
2537
- cmd. link_staticlib ( name, verbatim)
2537
+ cmd. link_staticlib_by_name ( name, verbatim)
2538
2538
}
2539
2539
} else {
2540
2540
if link_dynamic {
@@ -2791,7 +2791,7 @@ fn add_static_crate<'a>(
2791
2791
} else {
2792
2792
fix_windows_verbatim_for_gcc ( path)
2793
2793
} ;
2794
- cmd. link_rlib ( & rlib_path) ;
2794
+ cmd. link_staticlib_by_path ( & rlib_path) ;
2795
2795
} ;
2796
2796
2797
2797
if !are_upstream_rust_objects_already_included ( sess)
0 commit comments