diff options
| author | bors <bors@rust-lang.org> | 2020-10-14 17:53:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-14 17:53:52 +0000 |
| commit | e160e5cb80652bc2afe74cb3affbe35b74243ea9 (patch) | |
| tree | 683f318303f9ee852900354aef5efa7202c0ddf1 | |
| parent | 5565241f65cf402c3dbcb55dd492f172c473d4ce (diff) | |
| parent | d959011de0c55c2dac3daf3224c829931c09852a (diff) | |
| download | rust-e160e5cb80652bc2afe74cb3affbe35b74243ea9.tar.gz rust-e160e5cb80652bc2afe74cb3affbe35b74243ea9.zip | |
Auto merge of #77944 - shepmaster:aarch64-apple-darwin-new-xcode, r=pietroalbini
Update Xcode beta version to allow aarch64-apple-darwin to compile again r? `@pietroalbini`
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 828a3bc71b8..6025808eb61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -308,7 +308,7 @@ jobs: SCRIPT: "./x.py dist --stage 2" RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - SELECT_XCODE: /Applications/Xcode_12_beta.app + SELECT_XCODE: /Applications/Xcode_12.2.app USE_XCODE_CLANG: 1 MACOSX_DEPLOYMENT_TARGET: 11.0 MACOSX_STD_DEPLOYMENT_TARGET: 11.0 diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 090b06f2a0a..01f15a82f0f 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -475,7 +475,7 @@ jobs: --set rust.jemalloc --set llvm.ninja=false RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - SELECT_XCODE: /Applications/Xcode_12_beta.app + SELECT_XCODE: /Applications/Xcode_12.2.app USE_XCODE_CLANG: 1 MACOSX_DEPLOYMENT_TARGET: 11.0 MACOSX_STD_DEPLOYMENT_TARGET: 11.0 |