diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2025-09-29 21:37:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-29 21:37:50 -0400 |
| commit | c3e118b4db2d16aefb24fa9d9a597307a96200af (patch) | |
| tree | b91b1aeac966576f11d601668a23196ffb7ee2ec /src | |
| parent | 29b7717de23f3969ceeb5bef5b01d9223f807655 (diff) | |
| parent | 5df0be398845fa8b239f3e722c25b8369498df5c (diff) | |
| download | rust-c3e118b4db2d16aefb24fa9d9a597307a96200af.tar.gz rust-c3e118b4db2d16aefb24fa9d9a597307a96200af.zip | |
Rollup merge of #145883 - shepmaster:unify-macos-ci, r=madsmtm
Make macOS dist build configuration match where reasonable r? `@madsmtm`
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 8303699ce8a..4384ec76769 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -430,7 +430,8 @@ auto: # Ensure that host tooling is built to support our minimum support macOS version. MACOSX_DEPLOYMENT_TARGET: 10.12 MACOSX_STD_DEPLOYMENT_TARGET: 10.12 - SELECT_XCODE: /Applications/Xcode_15.2.app + SELECT_XCODE: /Applications/Xcode_15.4.app + USE_XCODE_CLANG: 1 DIST_REQUIRE_ALL_TOOLS: 1 CODEGEN_BACKENDS: llvm,cranelift <<: *job-macos @@ -450,21 +451,24 @@ auto: - name: dist-aarch64-apple env: - SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin + SCRIPT: >- + ./x.py dist bootstrap + --include-default-paths + --host=aarch64-apple-darwin + --target=aarch64-apple-darwin RUST_CONFIGURE_ARGS: >- --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc - --set llvm.ninja=false --set rust.lto=thin --set rust.codegen-units=1 - SELECT_XCODE: /Applications/Xcode_15.4.app - USE_XCODE_CLANG: 1 # Aarch64 tooling only needs to support macOS 11.0 and up as nothing else # supports the hardware. MACOSX_DEPLOYMENT_TARGET: 11.0 MACOSX_STD_DEPLOYMENT_TARGET: 11.0 + SELECT_XCODE: /Applications/Xcode_15.4.app + USE_XCODE_CLANG: 1 DIST_REQUIRE_ALL_TOOLS: 1 CODEGEN_BACKENDS: llvm,cranelift <<: *job-macos |