@@ -2060,14 +2060,11 @@ impl Build {
2060
2060
} else {
2061
2061
cmd. push_cc_arg ( format ! ( "--target={}" , target) . into ( ) ) ;
2062
2062
}
2063
- } else {
2064
- if target. contains ( "i586" ) {
2065
- cmd. push_cc_arg ( "-arch:IA32" . into ( ) ) ;
2066
- } else if target. contains ( "arm64ec" ) {
2067
- cmd. push_cc_arg ( "-arm64EC" . into ( ) ) ;
2068
- }
2063
+ } else if target. contains ( "i586" ) {
2064
+ cmd. push_cc_arg ( "-arch:IA32" . into ( ) ) ;
2065
+ } else if target. contains ( "arm64ec" ) {
2066
+ cmd. push_cc_arg ( "-arm64EC" . into ( ) ) ;
2069
2067
}
2070
-
2071
2068
// There is a check in corecrt.h that will generate a
2072
2069
// compilation error if
2073
2070
// _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE is
@@ -3414,12 +3411,11 @@ impl Build {
3414
3411
} )
3415
3412
} )
3416
3413
. map ( |prefix| * prefix)
3417
- . or_else ( ||
3418
3414
// If no toolchain was found, provide the first toolchain that was passed in.
3419
3415
// This toolchain has been shown not to exist, however it will appear in the
3420
3416
// error that is shown to the user which should make it easier to search for
3421
3417
// where it should be obtained.
3422
- prefixes. first ( ) . map ( |prefix| * prefix) )
3418
+ . or_else ( || prefixes. first ( ) . map ( |prefix| * prefix) )
3423
3419
}
3424
3420
3425
3421
fn get_target ( & self ) -> Result < Arc < str > , Error > {
@@ -3753,6 +3749,7 @@ enum AppleOs {
3753
3749
WatchOs ,
3754
3750
TvOs ,
3755
3751
}
3752
+
3756
3753
impl std:: fmt:: Debug for AppleOs {
3757
3754
fn fmt ( & self , f : & mut Formatter < ' _ > ) -> fmt:: Result {
3758
3755
match self {
0 commit comments