Skip to content

Commit e160e5c

Browse files
committedOct 14, 2020
Auto merge of rust-lang#77944 - shepmaster:aarch64-apple-darwin-new-xcode, r=pietroalbini
Update Xcode beta version to allow aarch64-apple-darwin to compile again r? `@pietroalbini`
2 parents 5565241 + d959011 commit e160e5c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ jobs:
308308
SCRIPT: "./x.py dist --stage 2"
309309
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"
310310
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
311-
SELECT_XCODE: /Applications/Xcode_12_beta.app
311+
SELECT_XCODE: /Applications/Xcode_12.2.app
312312
USE_XCODE_CLANG: 1
313313
MACOSX_DEPLOYMENT_TARGET: 11.0
314314
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

‎src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ jobs:
475475
--set rust.jemalloc
476476
--set llvm.ninja=false
477477
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
478-
SELECT_XCODE: /Applications/Xcode_12_beta.app
478+
SELECT_XCODE: /Applications/Xcode_12.2.app
479479
USE_XCODE_CLANG: 1
480480
MACOSX_DEPLOYMENT_TARGET: 11.0
481481
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

0 commit comments

Comments
 (0)
Please sign in to comment.