@@ -1592,15 +1592,16 @@ impl Build {
1592
1592
}
1593
1593
} else if target. contains ( "watchos-sim" ) {
1594
1594
if let Some ( arch) =
1595
- map_darwin_target_from_rust_to_compiler_architecture ( target)
1595
+ map_darwin_target_from_rust_to_compiler_architecture ( target)
1596
1596
{
1597
1597
let deployment_target = env:: var ( "WATCHOS_DEPLOYMENT_TARGET" )
1598
1598
. unwrap_or_else ( |_| "5.0" . into ( ) ) ;
1599
1599
cmd. args . push (
1600
1600
format ! (
1601
1601
"--target={}-apple-watchos{}-simulator" ,
1602
1602
arch, deployment_target
1603
- ) . into ( ) ,
1603
+ )
1604
+ . into ( ) ,
1604
1605
) ;
1605
1606
}
1606
1607
} else if target. starts_with ( "riscv64gc-" ) {
@@ -2179,23 +2180,21 @@ impl Build {
2179
2180
} ) ?;
2180
2181
2181
2182
let arch = match arch {
2182
- "armv7k" => ArchSpec :: Device ( "armv7k" ) ,
2183
- "arm64_32" => ArchSpec :: Device ( "arm64_32" ) ,
2184
- "i386" | "i686" => ArchSpec :: Simulator ( "-m32" ) ,
2185
- "x86_64" => ArchSpec :: Simulator ( "-m64" ) ,
2186
- _ => {
2187
- return Err ( Error :: new (
2188
- ErrorKind :: ArchitectureInvalid ,
2189
- "Unknown architecture for watchOS target." ,
2190
- ) ) ;
2191
- }
2192
-
2183
+ "armv7k" => ArchSpec :: Device ( "armv7k" ) ,
2184
+ "arm64_32" => ArchSpec :: Device ( "arm64_32" ) ,
2185
+ "i386" | "i686" => ArchSpec :: Simulator ( "-m32" ) ,
2186
+ "x86_64" => ArchSpec :: Simulator ( "-m64" ) ,
2187
+ _ => {
2188
+ return Err ( Error :: new (
2189
+ ErrorKind :: ArchitectureInvalid ,
2190
+ "Unknown architecture for watchOS target." ,
2191
+ ) ) ;
2192
+ }
2193
2193
} ;
2194
2194
2195
2195
let min_version =
2196
2196
std:: env:: var ( "WATCHOS_DEPLOYMENT_TARGET" ) . unwrap_or_else ( |_| "2.0" . into ( ) ) ;
2197
2197
2198
-
2199
2198
let sdk = match arch {
2200
2199
ArchSpec :: Device ( arch) => {
2201
2200
cmd. args . push ( "-arch" . into ( ) ) ;
0 commit comments