Skip to content

Commit 4392847

Browse files
committed
Auto merge of rust-lang#131570 - ehuss:update-xcode, r=Mark-Simulacrum
(ci) Update macOS Xcode to 15 This updates the macOS builders to Xcode 15. The aarch64 images will be removing Xcode 14 and 16 very soon (actions/runner-images#10703), so we will need to make the switch to continue operating. The linked issue also documents GitHub's new policy for how they will be updating Xcode in the future. Also worth being aware of is the future plans for x86 runners documented in actions/runner-images#9255 and actions/runner-images#10686, which will impact our future upgrade behaviors. I decided to also update the Xcode in the x86_64 runners, even though they are not being removed. It felt better to me to have all macOS runners on the same (major) version of Xcode. However, note that the x86_64 runners do not have the latest version of 15 (15.4), so I left them at 15.2 (which is currently the default Xcode of the runner). Xcode 15 was previously causing problems (see rust-lang#121058) which seem to be resolved now. `@bjorn3` fixed the `invalid r_symbolnum` issue with cranelift. The issue with clang failing to link seems to be fixed, possibly by the update of the pre-built LLVM from 14 to llvm 15 in rust-lang#124850, or an update in our source version of LLVM. I have run some try builds and at least LLVM seems to build (I did not run any tests). Closes rust-lang#121058
2 parents 31e102c + 16b91e8 commit 4392847

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/ci/github-actions/jobs.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ envs:
5151
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
5252
MACOSX_DEPLOYMENT_TARGET: 10.12
5353
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
54-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
54+
SELECT_XCODE: /Applications/Xcode_15.2.app
5555
NO_LLVM_ASSERTIONS: 1
5656
NO_DEBUG_ASSERTIONS: 1
5757
NO_OVERFLOW_CHECKS: 1
@@ -287,7 +287,7 @@ auto:
287287
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
288288
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
289289
MACOSX_DEPLOYMENT_TARGET: 10.12
290-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
290+
SELECT_XCODE: /Applications/Xcode_15.2.app
291291
NO_LLVM_ASSERTIONS: 1
292292
NO_DEBUG_ASSERTIONS: 1
293293
NO_OVERFLOW_CHECKS: 1
@@ -303,7 +303,7 @@ auto:
303303
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
304304
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
305305
MACOSX_DEPLOYMENT_TARGET: 10.12
306-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
306+
SELECT_XCODE: /Applications/Xcode_15.2.app
307307
NO_LLVM_ASSERTIONS: 1
308308
NO_DEBUG_ASSERTIONS: 1
309309
NO_OVERFLOW_CHECKS: 1
@@ -332,7 +332,7 @@ auto:
332332
--set llvm.ninja=false
333333
--set rust.lto=thin
334334
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
335-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
335+
SELECT_XCODE: /Applications/Xcode_15.4.app
336336
USE_XCODE_CLANG: 1
337337
MACOSX_DEPLOYMENT_TARGET: 11.0
338338
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -352,7 +352,7 @@ auto:
352352
--enable-profiler
353353
--set rust.jemalloc
354354
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
355-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
355+
SELECT_XCODE: /Applications/Xcode_15.4.app
356356
USE_XCODE_CLANG: 1
357357
MACOSX_DEPLOYMENT_TARGET: 11.0
358358
MACOSX_STD_DEPLOYMENT_TARGET: 11.0

tests/debuginfo/constant-ordering-prologue.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
// lldb-command:run
2121

2222
// lldb-command:print a
23-
// lldb-check: = 19
23+
// lldb-check: 19
2424
// lldb-command:print b
25-
// lldb-check: = 20
25+
// lldb-check: 20
2626
// lldb-command:print c
27-
// lldb-check: = 21.5
27+
// lldb-check: 21.5
2828

2929
fn binding(a: i64, b: u64, c: f64) {
3030
let x = 0;

0 commit comments

Comments
 (0)