Skip to content

Allow a "default" environment for the apple_sdk_name function instead of a blank one #1605

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 1 commit into from
Oct 31, 2025
+18 −10
Merged

Allow a "default" environment for the apple_sdk_name function instead of a blank one #1605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 18 additions & 10 deletions src/target/apple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@ use super::TargetInfo;
impl TargetInfo<'_> {
pub(crate) fn apple_sdk_name(&self) -> &'static str {
match (self.os, self.env) {
("macos", "") => "macosx",
("ios", "") => "iphoneos",
// The target_env variable, as written here:
// https://doc.rust-lang.org/reference/conditional-compilation.html#target_env
// is only really used for disambiguation, so we use a "default" case instead of
// checking for a blank string.
("macos", _) => "macosx",
("ios", "sim") => "iphonesimulator",
("ios", "macabi") => "macosx",
("tvos", "") => "appletvos",
("ios", _) => "iphoneos",
("tvos", "sim") => "appletvsimulator",
("watchos", "") => "watchos",
("tvos", _) => "appletvos",
("watchos", "sim") => "watchsimulator",
("visionos", "") => "xros",
("watchos", _) => "watchos",
("visionos", "sim") => "xrsimulator",
("visionos", _) => "xros",
(os, _) => panic!("invalid Apple target OS {}", os),
}
}
Expand All @@ -31,18 +35,22 @@ impl TargetInfo<'_> {
// https://clang.llvm.org/docs/AttributeReference.html#availability
// https://gcc.gnu.org/onlinedocs/gcc/Darwin-Options.html#index-mmacosx-version-min
match (self.os, self.env) {
("macos", "") => format!("-mmacosx-version-min={min_version}"),
("ios", "") => format!("-miphoneos-version-min={min_version}"),
// The target_env variable, as written here:
// https://doc.rust-lang.org/reference/conditional-compilation.html#target_env
// is only really used for disambiguation, so we use a "default" case instead of
// checking for a blank string.
("macos", _) => format!("-mmacosx-version-min={min_version}"),
("ios", "sim") => format!("-mios-simulator-version-min={min_version}"),
("ios", "macabi") => format!("-mtargetos=ios{min_version}-macabi"),
("tvos", "") => format!("-mappletvos-version-min={min_version}"),
("ios", _) => format!("-miphoneos-version-min={min_version}"),
("tvos", "sim") => format!("-mappletvsimulator-version-min={min_version}"),
("watchos", "") => format!("-mwatchos-version-min={min_version}"),
("tvos", _) => format!("-mappletvos-version-min={min_version}"),
("watchos", "sim") => format!("-mwatchsimulator-version-min={min_version}"),
("watchos", _) => format!("-mwatchos-version-min={min_version}"),
// `-mxros-version-min` does not exist
// https://github.com/llvm/llvm-project/issues/88271
("visionos", "") => format!("-mtargetos=xros{min_version}"),
("visionos", "sim") => format!("-mtargetos=xros{min_version}-simulator"),
("visionos", _) => format!("-mtargetos=xros{min_version}"),
(os, _) => panic!("invalid Apple target OS {}", os),
}
}
Expand Down