diff options
| author | bors <bors@rust-lang.org> | 2024-12-03 09:47:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-03 09:47:39 +0000 |
| commit | ae3703cdf271b07cbc7cbaeda0ea8ab6bba60160 (patch) | |
| tree | 877a715e925340171b87e61918a7cbcf1c7770c6 /compiler/rustc_codegen_ssa/src | |
| parent | efdd9e802053caeb52103945df858e87f837e59a (diff) | |
| parent | 8ae11145cefdd3cf3fe693ca871a29c91050ab82 (diff) | |
| download | rust-ae3703cdf271b07cbc7cbaeda0ea8ab6bba60160.tar.gz rust-ae3703cdf271b07cbc7cbaeda0ea8ab6bba60160.zip | |
Auto merge of #133788 - matthiaskrgr:rollup-1p100a8, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- #132723 (Unify `sysroot_target_{bin,lib}dir` handling)
- #133041 (Print name of env var in `--print=deployment-target`)
- #133325 (Reimplement `~const` trait specialization)
- #133395 (Add simd_relaxed_fma intrinsic)
- #133517 (Deeply normalize when computing implied outlives bounds)
- #133785 (Add const evaluation error UI test.)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/apple.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/apple.rs b/compiler/rustc_codegen_ssa/src/back/apple.rs index 93d90cd16b2..d9c5c3e5af9 100644 --- a/compiler/rustc_codegen_ssa/src/back/apple.rs +++ b/compiler/rustc_codegen_ssa/src/back/apple.rs @@ -97,7 +97,7 @@ fn minimum_deployment_target(target: &Target) -> OSVersion { } /// Name of the environment variable used to fetch the deployment target on the given OS. -fn deployment_target_env_var(os: &str) -> &'static str { +pub fn deployment_target_env_var(os: &str) -> &'static str { match os { "macos" => "MACOSX_DEPLOYMENT_TARGET", "ios" => "IPHONEOS_DEPLOYMENT_TARGET", |