diff options
| author | Mads Marquart <mads@marquart.dk> | 2024-08-14 02:12:14 +0200 |
|---|---|---|
| committer | Mads Marquart <mads@marquart.dk> | 2024-08-14 02:12:14 +0200 |
| commit | 3ed63dd8435bf14c958f2d500010eb14bd7c11d8 (patch) | |
| tree | a76a6492104f8e4374c420b8988e1bf094d4fc9e /src/ci/github-actions | |
| parent | a2e1d154d53d0a87b78af3591ceadc9477151220 (diff) | |
| download | rust-3ed63dd8435bf14c958f2d500010eb14bd7c11d8.tar.gz rust-3ed63dd8435bf14c958f2d500010eb14bd7c11d8.zip | |
Promote Mac Catalyst targets to tier 2, and ship with rustup
- aarch64-apple-ios-macabi - x86_64-apple-ios-macabi
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 638f14ad53f..4de44c6dd39 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -285,8 +285,10 @@ auto: - image: dist-apple-various env: - SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim - RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc + SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim,aarch64-apple-ios-macabi,x86_64-apple-ios-macabi + # Mac Catalyst cannot currently compile the sanitizer: + # https://github.com/rust-lang/rust/issues/129069 + RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set target.aarch64-apple-ios-macabi.sanitizers=false --set target.x86_64-apple-ios-macabi.sanitizers=false RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.12 SELECT_XCODE: /Applications/Xcode_14.3.1.app |