granite-rust/compiler
bors 9afe713695 Auto merge of #129341 - madsmtm:refactor-deployment-target, r=petrochenkov
Apple: Refactor deployment target version parsing

Refactor deployment target parsing to make it easier to do https://github.com/rust-lang/rust/pull/129342 (I wanted to make sure of all the places that `std::env::var` is called).

Specifically, my goal was to minimize the amount of target-specific configuration, so to that end I renamed the `opts` function that generates the `TargetOptions` to `base`, and made it return the LLVM target and `target_arch` too. In the future, I would like to move even more out of the target files and into `spec::apple`, as it makes it easier for me to maintain.

For example, this fixed a bug in `aarch64-apple-watchos`, which wasn't passing the deployment target as part of the LLVM triple. This (probably) fixes https://github.com/rust-lang/rust/issues/123582 and fixes https://github.com/rust-lang/rust/issues/107630.

We also now parse the patch version of deployment targets, allowing the user to specify e.g. `MACOSX_DEPLOYMENT_TARGET=10.12.6`.

Finally, this fixes the LLVM target name for visionOS, it should be `*-apple-xros` and not `*-apple-visionos`.

Since I have changed all the Apple targets here, I smoke-tested my changes by running the following:
```console
# Build each target
./x build library --target="aarch64-apple-darwin,aarch64-apple-ios,aarch64-apple-ios-macabi,aarch64-apple-ios-sim,aarch64-apple-tvos,aarch64-apple-tvos-sim,aarch64-apple-visionos,aarch64-apple-visionos-sim,aarch64-apple-watchos,aarch64-apple-watchos-sim,arm64_32-apple-watchos,arm64e-apple-ios,armv7k-apple-watchos,armv7s-apple-ios,i386-apple-ios,x86_64-apple-darwin,x86_64-apple-ios,x86_64-apple-ios-macabi,x86_64-apple-tvos,x86_64-apple-watchos-sim,x86_64h-apple-darwin"

# Test that we can still at least link basic projects
cargo new foobar && cd foobar && cargo +stage1 build --target=aarch64-apple-darwin --target=aarch64-apple-ios --target=aarch64-apple-ios-macabi --target=aarch64-apple-ios-sim --target=aarch64-apple-tvos --target=aarch64-apple-tvos-sim --target=aarch64-apple-visionos --target=aarch64-apple-visionos-sim --target=aarch64-apple-watchos --target=aarch64-apple-watchos-sim --target=arm64_32-apple-watchos --target=armv7s-apple-ios --target=i386-apple-ios --target=x86_64-apple-darwin --target=x86_64-apple-ios --target=x86_64-apple-ios-macabi --target=x86_64-apple-tvos --target=x86_64-apple-watchos-sim --target=x86_64h-apple-darwin
```

I couldn't build for the `arm64e-apple-darwin` target, the `armv7k-apple-watchos` and `arm64e-apple-ios` targets failed to link, and I know that the `i686-apple-darwin` target requires a bit of setup, but all of this is as it was before this PR.

r? thomcc

CC `@BlackHoleFox`

I would recommend using `rollup=never` when merging this, in case we need to bisect this later.
2024-09-07 01:37:52 +00:00
..
rustc disable size asserts in the compiler when randomizing layouts 2024-08-31 23:56:45 +02:00
rustc_abi inhibit layout randomization for Box 2024-08-31 23:56:45 +02:00
rustc_arena compiler: Remove feature(new_uninit) 2024-08-27 10:17:05 -07:00
rustc_ast Create opaque definitions in resolver. 2024-08-31 20:14:43 +00:00
rustc_ast_ir Add warn(unreachable_pub) to several crates. 2024-08-16 08:46:13 +10:00
rustc_ast_lowering chore: Fix typos in 'compiler' (batch 1) 2024-09-02 07:42:38 +02:00
rustc_ast_passes Create opaque definitions in resolver. 2024-08-31 20:14:43 +00:00
rustc_ast_pretty Add warn(unreachable_pub) to rustc_ast_pretty. 2024-08-16 08:46:46 +10:00
rustc_attr Rollup merge of #126013 - nnethercote:unreachable_pub, r=Urgau 2024-08-27 00:41:57 +02:00
rustc_baked_icu_data Don't add warn(unreachable_pub) to rustc_baked_icu. 2024-08-16 08:46:52 +10:00
rustc_borrowck Rollup merge of #129969 - GrigorenkoPV:boxed-ty, r=compiler-errors 2024-09-06 07:33:58 +02:00
rustc_builtin_macros Rollup merge of #123940 - kornelski:remove-derived-debug, r=Urgau 2024-08-29 16:21:46 +02:00
rustc_codegen_cranelift introduce PrettyPrintMirOptions for cosmetic MIR dump options 2024-08-30 07:07:28 +00:00
rustc_codegen_gcc Rollup merge of #128731 - RalfJung:simd-shuffle-vector, r=workingjubilee 2024-08-27 01:46:50 -05:00
rustc_codegen_llvm Rollup merge of #129969 - GrigorenkoPV:boxed-ty, r=compiler-errors 2024-09-06 07:33:58 +02:00
rustc_codegen_ssa Auto merge of #129341 - madsmtm:refactor-deployment-target, r=petrochenkov 2024-09-07 01:37:52 +00:00
rustc_const_eval Make Ty::boxed_ty return an Option 2024-09-06 00:30:36 +03:00
rustc_data_structures Add an internal lint that warns when accessing untracked data 2024-09-03 19:14:19 +02:00
rustc_driver Use tidy to sort crate attributes for all compiler crates. 2024-06-12 15:49:10 +10:00
rustc_driver_impl Auto merge of #129341 - madsmtm:refactor-deployment-target, r=petrochenkov 2024-09-07 01:37:52 +00:00
rustc_error_codes chore: Fix typos in 'compiler' (batch 1) 2024-09-02 07:42:38 +02:00
rustc_error_messages Add warn(unreachable_pub) to rustc_error_messages. 2024-08-27 11:52:08 +10:00
rustc_errors Rollup merge of #129875 - Sajjon:sajjon_fix_typos_batch_1, r=compiler-errors,jieyouxu 2024-09-02 22:35:20 +02:00
rustc_expand Add warn(unreachable_pub) to rustc_expand. 2024-08-27 12:40:38 +10:00
rustc_feature Rollup merge of #128919 - Nadrieril:lint-query-leaks, r=cjgillot 2024-09-05 19:43:46 +02:00
rustc_fluent_macro Add warn(unreachable_pub) to rustc_fluent_macro. 2024-08-27 12:56:54 +10:00
rustc_fs_util Reformat use declarations. 2024-07-29 08:26:52 +10:00
rustc_graphviz Add warn(unreachable_pub) to rustc_graphviz. 2024-08-27 12:58:29 +10:00
rustc_hir Revert "Auto merge of #127537 - veluca93:struct_tf, r=BoxyUwU" 2024-09-01 16:35:53 +02:00
rustc_hir_analysis Auto merge of #128776 - Bryanskiy:deep-reject-ctxt, r=lcnr 2024-09-06 19:50:48 +00:00
rustc_hir_pretty Add warn(unreachable_pub) to rustc_hir_pretty. 2024-08-27 13:25:40 +10:00
rustc_hir_typeck Auto merge of #128776 - Bryanskiy:deep-reject-ctxt, r=lcnr 2024-09-06 19:50:48 +00:00
rustc_incremental Add warn(unreachable_pub) to rustc_incremental. 2024-08-27 14:30:20 +10:00
rustc_index disable size asserts in the compiler when randomizing layouts 2024-08-31 23:56:45 +02:00
rustc_index_macros Remove usage of specialization from newtype_index! 2024-06-30 16:42:53 +00:00
rustc_infer chore: Fix typos in 'compiler' (batch 1) 2024-09-02 07:42:38 +02:00
rustc_interface stabilize -Znext-solver=coherence 2024-09-05 07:57:16 +00:00
rustc_lexer Add warn(unreachable_pub) to rustc_lexer. 2024-08-27 15:12:46 +10:00
rustc_lint Rollup merge of #129969 - GrigorenkoPV:boxed-ty, r=compiler-errors 2024-09-06 07:33:58 +02:00
rustc_lint_defs update docs of missing_abi lint 2024-09-04 14:30:56 +02:00
rustc_llvm Rollup merge of #129749 - krasimirgg:llvm-20-lto, r=nikic 2024-08-31 14:46:09 +02:00
rustc_log Reformat use declarations. 2024-07-29 08:26:52 +10:00
rustc_macros Add warn(unreachable_pub) to rustc_metadata. 2024-08-29 20:13:06 +10:00
rustc_metadata Auto merge of #128776 - Bryanskiy:deep-reject-ctxt, r=lcnr 2024-09-06 19:50:48 +00:00
rustc_middle Auto merge of #128776 - Bryanskiy:deep-reject-ctxt, r=lcnr 2024-09-06 19:50:48 +00:00
rustc_mir_build Revert "Auto merge of #127537 - veluca93:struct_tf, r=BoxyUwU" 2024-09-01 16:35:53 +02:00
rustc_mir_dataflow Adjust SanityCheck. 2024-09-03 15:18:30 +10:00
rustc_mir_transform Rollup merge of #130013 - jonathan-conder:await_coverage, r=Zalathar 2024-09-06 07:33:59 +02:00
rustc_monomorphize Make Ty::boxed_ty return an Option 2024-09-06 00:30:36 +03:00
rustc_next_trait_solver Auto merge of #128776 - Bryanskiy:deep-reject-ctxt, r=lcnr 2024-09-06 19:50:48 +00:00
rustc_parse chore: Fix typos in 'compiler' (batch 2) 2024-09-02 07:50:22 +02:00
rustc_parse_format Add warn(unreachable_pub) to rustc_parse_format. 2024-08-29 20:13:06 +10:00
rustc_passes Rollup merge of #128919 - Nadrieril:lint-query-leaks, r=cjgillot 2024-09-05 19:43:46 +02:00
rustc_pattern_analysis Rollup merge of #128934 - Nadrieril:fix-empty-non-exhaustive, r=compiler-errors 2024-09-03 19:13:24 +02:00
rustc_privacy Add warn(unreachable_pub) to rustc_privacy. 2024-08-29 20:18:44 +10:00
rustc_query_impl Add warn(unreachable_pub) to rustc_query_impl. 2024-08-29 20:18:44 +10:00
rustc_query_system chore: Fix typos in 'compiler' (batch 2) 2024-09-02 07:50:22 +02:00
rustc_resolve Rollup merge of #129877 - Sajjon:sajjon_fix_typos_batch_2, r=fee1-dead 2024-09-02 22:35:21 +02:00
rustc_sanitizers Auto merge of #129777 - nnethercote:unreachable_pub-4, r=Urgau 2024-09-03 01:27:20 +00:00
rustc_serialize Auto merge of #129777 - nnethercote:unreachable_pub-4, r=Urgau 2024-09-03 01:27:20 +00:00
rustc_session stabilize -Znext-solver=coherence 2024-09-05 07:57:16 +00:00
rustc_smir Auto merge of #129777 - nnethercote:unreachable_pub-4, r=Urgau 2024-09-03 01:27:20 +00:00
rustc_span Rollup merge of #128919 - Nadrieril:lint-query-leaks, r=cjgillot 2024-09-05 19:43:46 +02:00
rustc_symbol_mangling Auto merge of #129777 - nnethercote:unreachable_pub-4, r=Urgau 2024-09-03 01:27:20 +00:00
rustc_target Auto merge of #129341 - madsmtm:refactor-deployment-target, r=petrochenkov 2024-09-07 01:37:52 +00:00
rustc_trait_selection Auto merge of #128776 - Bryanskiy:deep-reject-ctxt, r=lcnr 2024-09-06 19:50:48 +00:00
rustc_traits Add warn(unreachable_pub) to rustc_traits. 2024-09-03 08:49:54 +10:00
rustc_transmute Auto merge of #129777 - nnethercote:unreachable_pub-4, r=Urgau 2024-09-03 01:27:20 +00:00
rustc_ty_utils Add warn(unreachable_pub) to rustc_ty_utils. 2024-09-03 08:50:33 +10:00
rustc_type_ir Auto merge of #128776 - Bryanskiy:deep-reject-ctxt, r=lcnr 2024-09-06 19:50:48 +00:00
rustc_type_ir_macros Reformat use declarations. 2024-07-29 08:26:52 +10:00
stable_mir chore: Fix typos in 'compiler' (batch 3) 2024-09-02 07:33:41 +02:00