59
59
SCRIPT : ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
60
60
RUST_CONFIGURE_ARGS : --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
61
61
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
62
+ # Ensure that host tooling is tested on our minimum supported macOS version.
62
63
MACOSX_DEPLOYMENT_TARGET : 10.12
63
64
MACOSX_STD_DEPLOYMENT_TARGET : 10.12
64
65
SELECT_XCODE : /Applications/Xcode_15.2.app
@@ -370,7 +371,9 @@ auto:
370
371
SCRIPT : ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
371
372
RUST_CONFIGURE_ARGS : --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
372
373
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
374
+ # Ensure that host tooling is built to support our minimum support macOS version.
373
375
MACOSX_DEPLOYMENT_TARGET : 10.12
376
+ MACOSX_STD_DEPLOYMENT_TARGET : 10.12
374
377
SELECT_XCODE : /Applications/Xcode_15.2.app
375
378
NO_LLVM_ASSERTIONS : 1
376
379
NO_DEBUG_ASSERTIONS : 1
@@ -386,7 +389,10 @@ auto:
386
389
# https://github.com/rust-lang/rust/issues/129069
387
390
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
388
391
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
392
+ # Ensure that host tooling is built to support our minimum support macOS version.
393
+ # FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
389
394
MACOSX_DEPLOYMENT_TARGET : 10.12
395
+ MACOSX_STD_DEPLOYMENT_TARGET : 10.12
390
396
SELECT_XCODE : /Applications/Xcode_15.2.app
391
397
NO_LLVM_ASSERTIONS : 1
392
398
NO_DEBUG_ASSERTIONS : 1
@@ -404,7 +410,6 @@ auto:
404
410
<< : *env-x86_64-apple-tests
405
411
<< : *job-macos-xl
406
412
407
- # This target only needs to support 11.0 and up as nothing else supports the hardware
408
413
- name : dist-aarch64-apple
409
414
env :
410
415
SCRIPT : ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
@@ -419,6 +424,8 @@ auto:
419
424
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
420
425
SELECT_XCODE : /Applications/Xcode_15.4.app
421
426
USE_XCODE_CLANG : 1
427
+ # Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
428
+ # supports the hardware.
422
429
MACOSX_DEPLOYMENT_TARGET : 11.0
423
430
MACOSX_STD_DEPLOYMENT_TARGET : 11.0
424
431
NO_LLVM_ASSERTIONS : 1
@@ -428,7 +435,6 @@ auto:
428
435
CODEGEN_BACKENDS : llvm,cranelift
429
436
<< : *job-macos-m1
430
437
431
- # This target only needs to support 11.0 and up as nothing else supports the hardware
432
438
- name : aarch64-apple
433
439
env :
434
440
SCRIPT : ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
@@ -439,6 +445,8 @@ auto:
439
445
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
440
446
SELECT_XCODE : /Applications/Xcode_15.4.app
441
447
USE_XCODE_CLANG : 1
448
+ # Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
449
+ # supports the hardware, so only need to test it there.
442
450
MACOSX_DEPLOYMENT_TARGET : 11.0
443
451
MACOSX_STD_DEPLOYMENT_TARGET : 11.0
444
452
NO_LLVM_ASSERTIONS : 1
0 commit comments