File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -2595,11 +2595,12 @@ impl Build {
2595
2595
}
2596
2596
2597
2597
fn prefix_for_target ( & self , target : & str ) -> Option < String > {
2598
+ // Put aside RUSTC_LINKER's prefix to be used as last resort
2599
+ let rustc_linker = self . getenv ( "RUSTC_LINKER" ) . unwrap_or ( "" . to_string ( ) ) ;
2600
+ let linker_prefix = rustc_linker. strip_suffix ( "-gcc" ) ;
2598
2601
// CROSS_COMPILE is of the form: "arm-linux-gnueabi-"
2599
2602
let cc_env = self . getenv ( "CROSS_COMPILE" ) ;
2600
- let cross_compile = cc_env
2601
- . as_ref ( )
2602
- . map ( |s| s. trim_right_matches ( '-' ) . to_owned ( ) ) ;
2603
+ let cross_compile = cc_env. as_ref ( ) . map ( |s| s. trim_end_matches ( '-' ) . to_owned ( ) ) ;
2603
2604
cross_compile. or ( match & target[ ..] {
2604
2605
"aarch64-pc-windows-gnu" => Some ( "aarch64-w64-mingw32" ) ,
2605
2606
"aarch64-uwp-windows-gnu" => Some ( "aarch64-w64-mingw32" ) ,
@@ -2706,7 +2707,7 @@ impl Build {
2706
2707
] ) , // explicit None if not found, so caller knows to fall back
2707
2708
"x86_64-unknown-linux-musl" => Some ( "musl" ) ,
2708
2709
"x86_64-unknown-netbsd" => Some ( "x86_64--netbsd" ) ,
2709
- _ => None ,
2710
+ _ => linker_prefix ,
2710
2711
}
2711
2712
. map ( |x| x. to_owned ( ) ) )
2712
2713
}
You can’t perform that action at this time.
0 commit comments