Skip to content

Commit 57a1000

Browse files
committed
Mark windows-gnu* as lacking build with assertions
1 parent dfe1b8c commit 57a1000

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/bootstrap/src/core/build_steps/llvm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ pub(crate) fn is_ci_llvm_available_for_target(
210210
("i686-unknown-linux-gnu", false),
211211
("x86_64-unknown-linux-gnu", true),
212212
("x86_64-apple-darwin", true),
213-
("x86_64-pc-windows-gnu", true),
213+
("x86_64-pc-windows-gnu", false),
214214
("x86_64-pc-windows-msvc", true),
215215
// tier 2 with host tools
216216
("aarch64-unknown-linux-musl", false),
@@ -227,7 +227,7 @@ pub(crate) fn is_ci_llvm_available_for_target(
227227
("powerpc64le-unknown-linux-musl", false),
228228
("riscv64gc-unknown-linux-gnu", false),
229229
("s390x-unknown-linux-gnu", false),
230-
("x86_64-pc-windows-gnullvm", true),
230+
("x86_64-pc-windows-gnullvm", false),
231231
("x86_64-unknown-freebsd", false),
232232
("x86_64-unknown-illumos", false),
233233
("x86_64-unknown-linux-musl", false),

src/ci/github-actions/jobs.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,16 +612,12 @@ auto:
612612
env:
613613
SCRIPT: make ci-mingw-x
614614
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
615-
# There is no dist-x86_64-mingw-alt, so there is no prebuilt LLVM with assertions
616-
NO_DOWNLOAD_CI_LLVM: 1
617615
<<: *job-windows
618616

619617
- name: x86_64-mingw-2
620618
env:
621619
SCRIPT: make ci-mingw-bootstrap
622620
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
623-
# There is no dist-x86_64-mingw-alt, so there is no prebuilt LLVM with assertions
624-
NO_DOWNLOAD_CI_LLVM: 1
625621
<<: *job-windows
626622

627623
- name: dist-x86_64-msvc

0 commit comments

Comments
 (0)