Commit 821b03d 1 parent 2bf3004 commit 821b03d Copy full SHA for 821b03d
File tree 2 files changed +10
-18
lines changed
2 files changed +10
-18
lines changed Original file line number Diff line number Diff line change @@ -348,8 +348,8 @@ jobs:
348
348
os : macos-13
349
349
- name : dist-aarch64-apple
350
350
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 "
353
353
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
354
354
SELECT_XCODE : /Applications/Xcode_13.4.1.app
355
355
USE_XCODE_CLANG : 1
@@ -359,8 +359,7 @@ jobs:
359
359
NO_DEBUG_ASSERTIONS : 1
360
360
NO_OVERFLOW_CHECKS : 1
361
361
DIST_REQUIRE_ALL_TOOLS : 1
362
- JEMALLOC_SYS_WITH_LG_PAGE : 14
363
- os : macos-13
362
+ os : macos-13-xlarge
364
363
- name : x86_64-msvc
365
364
env :
366
365
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:
91
91
os : macos-13 # We use the standard runner for now
92
92
<< : *base-job
93
93
94
+ - &job-macos-m1
95
+ os : macos-13-xlarge
96
+ << : *base-job
97
+
94
98
- &job-windows-8c
95
99
os : windows-2019-8core-32gb
96
100
<< : *base-job
@@ -527,17 +531,14 @@ jobs:
527
531
# This target only needs to support 11.0 and up as nothing else supports the hardware
528
532
- name : dist-aarch64-apple
529
533
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
531
535
RUST_CONFIGURE_ARGS : >-
532
- --build=x86_64-apple-darwin
533
- --host=aarch64-apple-darwin
534
- --target=aarch64-apple-darwin
535
536
--enable-full-tools
536
537
--enable-sanitizers
537
538
--enable-profiler
538
- --disable-docs
539
539
--set rust.jemalloc
540
540
--set llvm.ninja=false
541
+ --set rust.lto=thin
541
542
RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
542
543
SELECT_XCODE : /Applications/Xcode_13.4.1.app
543
544
USE_XCODE_CLANG : 1
@@ -547,15 +548,7 @@ jobs:
547
548
NO_DEBUG_ASSERTIONS : 1
548
549
NO_OVERFLOW_CHECKS : 1
549
550
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
559
552
560
553
# #####################
561
554
# Windows Builders #
You can’t perform that action at this time.
0 commit comments