This repository was archived by the owner on May 28, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +10
-18
lines changed Expand file tree Collapse file tree 2 files changed +10
-18
lines changed Original file line number Diff line number Diff line change @@ -348,8 +348,8 @@ jobs:
348348 os : macos-13
349349 - name : dist-aarch64-apple
350350 env :
351- SCRIPT : " ./x.py dist bootstrap --include-default-paths --stage 2 "
352- RUST_CONFIGURE_ARGS : " --build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin -- enable-full-tools --enable-sanitizers --enable-profiler --disable-docs -- set rust.jemalloc --set llvm.ninja=false"
351+ SCRIPT : " ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin "
352+ RUST_CONFIGURE_ARGS : " --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin "
353353 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
354354 SELECT_XCODE : /Applications/Xcode_13.4.1.app
355355 USE_XCODE_CLANG : 1
@@ -359,8 +359,7 @@ jobs:
359359 NO_DEBUG_ASSERTIONS : 1
360360 NO_OVERFLOW_CHECKS : 1
361361 DIST_REQUIRE_ALL_TOOLS : 1
362- JEMALLOC_SYS_WITH_LG_PAGE : 14
363- os : macos-13
362+ os : macos-13-xlarge
364363 - name : x86_64-msvc
365364 env :
366365 RUST_CONFIGURE_ARGS : " --build=x86_64-pc-windows-msvc --enable-profiler"
Original file line number Diff line number Diff line change @@ -91,6 +91,10 @@ x--expand-yaml-anchors--remove:
9191 os : macos-13 # We use the standard runner for now
9292 << : *base-job
9393
94+ - &job-macos-m1
95+ os : macos-13-xlarge
96+ << : *base-job
97+
9498 - &job-windows-8c
9599 os : windows-2019-8core-32gb
96100 << : *base-job
@@ -527,17 +531,14 @@ jobs:
527531 # This target only needs to support 11.0 and up as nothing else supports the hardware
528532 - name : dist-aarch64-apple
529533 env :
530- SCRIPT : ./x.py dist bootstrap --include-default-paths --stage 2
534+ SCRIPT : ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
531535 RUST_CONFIGURE_ARGS : >-
532- --build=x86_64-apple-darwin
533- --host=aarch64-apple-darwin
534- --target=aarch64-apple-darwin
535536 --enable-full-tools
536537 --enable-sanitizers
537538 --enable-profiler
538- --disable-docs
539539 --set rust.jemalloc
540540 --set llvm.ninja=false
541+ --set rust.lto=thin
541542 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
542543 SELECT_XCODE : /Applications/Xcode_13.4.1.app
543544 USE_XCODE_CLANG : 1
@@ -547,15 +548,7 @@ jobs:
547548 NO_DEBUG_ASSERTIONS : 1
548549 NO_OVERFLOW_CHECKS : 1
549550 DIST_REQUIRE_ALL_TOOLS : 1
550- # Corresponds to 16K page size
551- #
552- # Shouldn't be needed if jemalloc-sys is updated to
553- # handle this platform like iOS or if we build on
554- # aarch64-apple-darwin itself.
555- #
556- # https://github.com/gnzlbg/jemallocator/blob/c27a859e98e3cb790dc269773d9da71a1e918458/jemalloc-sys/build.rs#L237
557- JEMALLOC_SYS_WITH_LG_PAGE : 14
558- << : *job-macos-xl
551+ << : *job-macos-m1
559552
560553 # #####################
561554 # Windows Builders #
You can’t perform that action at this time.
0 commit comments