From 5209d6f5fdac2054666a15c64f78450d6cb99717 Mon Sep 17 00:00:00 2001 From: imWildCat Date: Thu, 26 Jan 2023 23:29:08 -0800 Subject: [PATCH] Remove hardcoded clang target: ios13 or ios14 for Mac Catalyst [fixed] --- compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs | 4 ++-- compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs b/compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs index 0009972cf42..2b135b67034 100644 --- a/compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs +++ b/compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs @@ -2,7 +2,7 @@ use crate::spec::{Cc, FramePointer, LinkerFlavor, Lld, Target, TargetOptions}; pub fn target() -> Target { - let llvm_target = "arm64-apple-ios14.0-macabi"; + let llvm_target = "arm64-apple-ios-macabi"; let arch = Arch::Arm64_macabi; let mut base = opts("ios", arch); @@ -22,7 +22,7 @@ pub fn target() -> Target { // These arguments are not actually invoked - they just have // to look right to pass App Store validation. bitcode_llvm_cmdline: "-triple\0\ - arm64-apple-ios14.0-macabi\0\ + arm64-apple-ios-macabi\0\ -emit-obj\0\ -disable-llvm-passes\0\ -Os\0" diff --git a/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs b/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs index 0f3f8519963..5a3e2a79bb9 100644 --- a/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs +++ b/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs @@ -2,7 +2,7 @@ use crate::spec::{Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions}; pub fn target() -> Target { - let llvm_target = "x86_64-apple-ios13.0-macabi"; + let llvm_target = "x86_64-apple-ios-macabi"; let arch = Arch::X86_64_macabi; let mut base = opts("ios", arch);