Skip to content

Commit fd942a5

Browse files
shepmastercuviper
authored andcommitted
Demote x86_64-apple-darwin to Tier 2 with host tools
Switch to only using aarch64 runners (implying we are now cross-compiling) and stop running tests. In the future, we could enable (some?) tests via Rosetta 2. (cherry picked from commit c574c91)
1 parent b991118 commit fd942a5

File tree

4 files changed

+21
-33
lines changed

4 files changed

+21
-33
lines changed

compiler/rustc_target/src/spec/targets/x86_64_apple_darwin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub(crate) fn target() -> Target {
77
llvm_target,
88
metadata: TargetMetadata {
99
description: Some("x86_64 Apple macOS (10.12+, Sierra+)".into()),
10-
tier: Some(1),
10+
tier: Some(2),
1111
host_tools: Some(true),
1212
std: Some(true),
1313
},

src/ci/github-actions/jobs.yml

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ runners:
2323
<<: *base-job
2424

2525
- &job-macos
26-
os: macos-13
27-
<<: *base-job
28-
29-
- &job-macos-m1
3026
os: macos-14
3127
<<: *base-job
3228

@@ -68,17 +64,6 @@ runners:
6864
<<: *base-job
6965

7066
envs:
71-
env-x86_64-apple-tests: &env-x86_64-apple-tests
72-
SCRIPT: ./x.py check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
73-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
74-
# Ensure that host tooling is tested on our minimum supported macOS version.
75-
MACOSX_DEPLOYMENT_TARGET: 10.12
76-
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
77-
SELECT_XCODE: /Applications/Xcode_15.2.app
78-
NO_LLVM_ASSERTIONS: 1
79-
NO_DEBUG_ASSERTIONS: 1
80-
NO_OVERFLOW_CHECKS: 1
81-
8267
production:
8368
&production
8469
DEPLOY_BUCKET: rust-lang-ci2
@@ -449,8 +434,19 @@ auto:
449434

450435
- name: dist-x86_64-apple
451436
env:
452-
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
453-
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
437+
SCRIPT: >-
438+
./x.py dist bootstrap
439+
--include-default-paths
440+
--host=x86_64-apple-darwin
441+
--target=x86_64-apple-darwin
442+
RUST_CONFIGURE_ARGS: >-
443+
--enable-full-tools
444+
--enable-sanitizers
445+
--enable-profiler
446+
--disable-docs
447+
--set rust.jemalloc
448+
--set rust.lto=thin
449+
--set rust.codegen-units=1
454450
# Ensure that host tooling is built to support our minimum support macOS version.
455451
MACOSX_DEPLOYMENT_TARGET: 10.12
456452
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
@@ -476,17 +472,6 @@ auto:
476472
NO_LLVM_ASSERTIONS: 1
477473
NO_DEBUG_ASSERTIONS: 1
478474
NO_OVERFLOW_CHECKS: 1
479-
<<: *job-macos-m1
480-
481-
- name: x86_64-apple-1
482-
env:
483-
<<: *env-x86_64-apple-tests
484-
<<: *job-macos
485-
486-
- name: x86_64-apple-2
487-
env:
488-
SCRIPT: ./x.py --stage 2 test tests/ui tests/rustdoc
489-
<<: *env-x86_64-apple-tests
490475
<<: *job-macos
491476

492477
- name: dist-aarch64-apple
@@ -511,7 +496,7 @@ auto:
511496
NO_OVERFLOW_CHECKS: 1
512497
DIST_REQUIRE_ALL_TOOLS: 1
513498
CODEGEN_BACKENDS: llvm,cranelift
514-
<<: *job-macos-m1
499+
<<: *job-macos
515500

516501
- name: aarch64-apple
517502
env:
@@ -531,7 +516,7 @@ auto:
531516
NO_LLVM_ASSERTIONS: 1
532517
NO_DEBUG_ASSERTIONS: 1
533518
NO_OVERFLOW_CHECKS: 1
534-
<<: *job-macos-m1
519+
<<: *job-macos
535520

536521
######################
537522
# Windows Builders #

src/doc/rustc/src/platform-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ target | notes
3636
`aarch64-unknown-linux-gnu` | ARM64 Linux (kernel 4.1+, glibc 2.17+)
3737
[`i686-pc-windows-msvc`](platform-support/windows-msvc.md) | 32-bit MSVC (Windows 10+, Windows Server 2016+, Pentium 4) [^x86_32-floats-return-ABI] [^win32-msvc-alignment]
3838
`i686-unknown-linux-gnu` | 32-bit Linux (kernel 3.2+, glibc 2.17+, Pentium 4) [^x86_32-floats-return-ABI]
39-
[`x86_64-apple-darwin`](platform-support/apple-darwin.md) | 64-bit macOS (10.12+, Sierra+)
4039
[`x86_64-pc-windows-gnu`](platform-support/windows-gnu.md) | 64-bit MinGW (Windows 10+, Windows Server 2016+)
4140
[`x86_64-pc-windows-msvc`](platform-support/windows-msvc.md) | 64-bit MSVC (Windows 10+, Windows Server 2016+)
4241
`x86_64-unknown-linux-gnu` | 64-bit Linux (kernel 3.2+, glibc 2.17+)
@@ -105,6 +104,7 @@ target | notes
105104
[`riscv64gc-unknown-linux-gnu`](platform-support/riscv64gc-unknown-linux-gnu.md) | RISC-V Linux (kernel 4.20+, glibc 2.29)
106105
[`riscv64gc-unknown-linux-musl`](platform-support/riscv64gc-unknown-linux-musl.md) | RISC-V Linux (kernel 4.20+, musl 1.2.3)
107106
[`s390x-unknown-linux-gnu`](platform-support/s390x-unknown-linux-gnu.md) | S390x Linux (kernel 3.2+, glibc 2.17)
107+
[`x86_64-apple-darwin`](platform-support/apple-darwin.md) | 64-bit macOS (10.12+, Sierra+)
108108
[`x86_64-unknown-freebsd`](platform-support/freebsd.md) | 64-bit x86 FreeBSD
109109
[`x86_64-unknown-illumos`](platform-support/illumos.md) | illumos
110110
`x86_64-unknown-linux-musl` | 64-bit Linux with musl 1.2.3

src/doc/rustc/src/platform-support/apple-darwin.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ Apple macOS targets.
44

55
**Tier: 1**
66

7-
- `x86_64-apple-darwin`: macOS on 64-bit x86.
87
- `aarch64-apple-darwin`: macOS on ARM64 (M1-family or later Apple Silicon CPUs).
98

9+
**Tier: 2**
10+
11+
- `x86_64-apple-darwin`: macOS on 64-bit x86.
12+
1013
## Target maintainers
1114

1215
[@thomcc](https://github.com/thomcc)

0 commit comments

Comments
 (0)