File tree Expand file tree Collapse file tree 2 files changed +2
-3
lines changed Expand file tree Collapse file tree 2 files changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -2096,7 +2096,8 @@ impl Config {
2096
2096
) ;
2097
2097
}
2098
2098
2099
- config. rust_std_features = std_features. unwrap_or_default ( ) ;
2099
+ let default_std_features = BTreeSet :: from ( [ String :: from ( "panic-unwind" ) ] ) ;
2100
+ config. rust_std_features = std_features. unwrap_or ( default_std_features) ;
2100
2101
2101
2102
let default = debug == Some ( true ) ;
2102
2103
config. rust_debug_assertions = debug_assertions. unwrap_or ( default) ;
Original file line number Diff line number Diff line change @@ -666,8 +666,6 @@ impl Build {
666
666
let mut features: BTreeSet < & str > =
667
667
self . config . rust_std_features . iter ( ) . map ( |s| s. as_str ( ) ) . collect ( ) ;
668
668
669
- features. insert ( "panic-unwind" ) ;
670
-
671
669
match self . config . llvm_libunwind ( target) {
672
670
LlvmLibunwind :: InTree => features. insert ( "llvm-libunwind" ) ,
673
671
LlvmLibunwind :: System => features. insert ( "system-llvm-libunwind" ) ,
You can’t perform that action at this time.
0 commit comments