@@ -244,6 +244,8 @@ fn link_env_remove(arch: Arch, os: &'static str) -> StaticCow<[StaticCow<str>]>
244
244
|| sdkroot. contains ( "iPhoneSimulator.platform" )
245
245
|| sdkroot. contains ( "AppleTVOS.platform" )
246
246
|| sdkroot. contains ( "AppleTVSimulator.platform" )
247
+ || sdkroot. contains ( "WatchOS.platform" )
248
+ || sdkroot. contains ( "WatchSimulator.platform" )
247
249
{
248
250
env_remove. push ( "SDKROOT" . into ( ) )
249
251
}
@@ -283,16 +285,6 @@ pub fn ios_llvm_target(arch: Arch) -> String {
283
285
format ! ( "{}-apple-ios{}.{}.0" , arch. target_name( ) , major, minor)
284
286
}
285
287
286
- pub fn tvos_sim_llvm_target ( arch : Arch ) -> String {
287
- let ( major, minor) = tvos_deployment_target ( ) ;
288
- format ! ( "{}-apple-tvos{}.{}.0-simulator" , arch. target_name( ) , major, minor)
289
- }
290
-
291
- pub fn tvos_llvm_target ( arch : Arch ) -> String {
292
- let ( major, minor) = tvos_deployment_target ( ) ;
293
- format ! ( "{}-apple-tvos{}.{}.0" , arch. target_name( ) , major, minor)
294
- }
295
-
296
288
fn ios_lld_platform_version ( ) -> String {
297
289
let ( major, minor) = ios_deployment_target ( ) ;
298
290
format ! ( "{major}.{minor}" )
@@ -313,6 +305,16 @@ fn tvos_lld_platform_version() -> String {
313
305
format ! ( "{major}.{minor}" )
314
306
}
315
307
308
+ pub fn tvos_llvm_target ( arch : Arch ) -> String {
309
+ let ( major, minor) = tvos_deployment_target ( ) ;
310
+ format ! ( "{}-apple-tvos{}.{}.0" , arch. target_name( ) , major, minor)
311
+ }
312
+
313
+ pub fn tvos_sim_llvm_target ( arch : Arch ) -> String {
314
+ let ( major, minor) = tvos_deployment_target ( ) ;
315
+ format ! ( "{}-apple-tvos{}.{}.0-simulator" , arch. target_name( ) , major, minor)
316
+ }
317
+
316
318
fn watchos_deployment_target ( ) -> ( u32 , u32 ) {
317
319
// If you are looking for the default deployment target, prefer `rustc --print deployment-target`.
318
320
from_set_deployment_target ( "WATCHOS_DEPLOYMENT_TARGET" ) . unwrap_or ( ( 5 , 0 ) )
0 commit comments