Skip to content

Fix IPHONEOS_DEPLOYMENT_TARGET on Mac Catalyst #121296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 20, 2024
Merged

Fix IPHONEOS_DEPLOYMENT_TARGET on Mac Catalyst #121296

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94ddbb6
Remove MACOSX_DEPLOYMENT_TARGET env var when linking Mac Catalyst
madsmtm Feb 19, 2024
92d4b31
Make LLVM target contain correct deployment target info on Mac Catalyst
madsmtm Feb 19, 2024
3cb4e34
Fix ld platform_version argument on Mac Catalyst
madsmtm Feb 19, 2024
cd530fc
Merge deployment target variable loading on iOS and Mac Catalyst
madsmtm Feb 19, 2024
a3cf493
Lower default Mac Catalyst deployment target to 13.1
madsmtm Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Lower default Mac Catalyst deployment target to 13.1 
Same default as Clang:
https://github.com/llvm/llvm-project/blob/d022f32c73c57b59a9121eba909f5034e89c628e/clang/lib/Driver/ToolChains/Darwin.cpp#L2038
  • Loading branch information
@madsmtm
madsmtm committed Feb 19, 2024
commit a3cf493642e770783d2bd89deb8afe90af45525b
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/base/apple/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@ fn ios_deployment_target(arch: Arch, abi: &str) -> (u32, u32) {
// If you are looking for the default deployment target, prefer `rustc --print deployment-target`.
let (major, minor) = match (arch, abi) {
(Arm64e, _) => (14, 0),
(_, "macabi") => (14, 0),
// Mac Catalyst defaults to 13.1 in Clang.
(_, "macabi") => (13, 1),
_ => (10, 0),
};
from_set_deployment_target("IPHONEOS_DEPLOYMENT_TARGET").unwrap_or((major, minor))
Expand Down