diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-11-02 08:33:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-02 08:33:10 +0100 |
| commit | bb544f863f94c9842cbee5b0b86cc07184ef71ad (patch) | |
| tree | 6d025cb26f1c0782206018d29dcf134a40de8834 /compiler/rustc_codegen_ssa/messages.ftl | |
| parent | ef972a346668ed4234d1a43ed4ad7ca4e9c58d51 (diff) | |
| parent | 1ef1af1c607fe268b5622041ff586ca603b8ec8d (diff) | |
| download | rust-bb544f863f94c9842cbee5b0b86cc07184ef71ad.tar.gz rust-bb544f863f94c9842cbee5b0b86cc07184ef71ad.zip | |
Rollup merge of #131037 - madsmtm:move-llvm-target-versioning, r=petrochenkov
Move versioned Apple LLVM targets from `rustc_target` to `rustc_codegen_ssa` Fully specified LLVM targets contain the OS version on macOS/iOS/tvOS/watchOS/visionOS, and this version depends on the deployment target environment variables like `MACOSX_DEPLOYMENT_TARGET`, `IPHONEOS_DEPLOYMENT_TARGET` etc. We would like to move this to later in the compilation pipeline, both because it feels impure to access environment variables when fetching target information, but mostly because we need access to more information from https://github.com/rust-lang/rust/pull/130883 to do https://github.com/rust-lang/rust/issues/118204. See also https://github.com/rust-lang/rust/pull/129342#issuecomment-2335156119 for some discussion. The first and second commit does the actual refactor, it should be a non-functional change, the third commit adds diagnostics for invalid deployment targets, which are now possible to do because we have access to the session. Tested with the same commands as in https://github.com/rust-lang/rust/pull/130435. r? ``````@petrochenkov``````
Diffstat (limited to 'compiler/rustc_codegen_ssa/messages.ftl')
| -rw-r--r-- | compiler/rustc_codegen_ssa/messages.ftl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/messages.ftl b/compiler/rustc_codegen_ssa/messages.ftl index d07274920fe..3b34eb063ec 100644 --- a/compiler/rustc_codegen_ssa/messages.ftl +++ b/compiler/rustc_codegen_ssa/messages.ftl @@ -2,6 +2,12 @@ codegen_ssa_L4Bender_exporting_symbols_unimplemented = exporting symbols not imp codegen_ssa_add_native_library = failed to add native library {$library_path}: {$error} +codegen_ssa_apple_deployment_target_invalid = + failed to parse deployment target specified in {$env_var}: {$error} + +codegen_ssa_apple_deployment_target_too_low = + deployment target in {$env_var} was set to {$version}, but the minimum supported by `rustc` is {$os_min} + codegen_ssa_apple_sdk_error_sdk_path = failed to get {$sdk_name} SDK path: {$error} codegen_ssa_archive_build_failure = failed to build archive at `{$path}`: {$error} |