Skip to content

Commit 3914f05

Browse files
Auto merge of #144597 - mati865:gnullvm-static-unwinder, r=<try>
windows-gnullvm: build the dist with static unwinder try-job: dist-aarch64-windows-gnullvm try-job: dist-x86_64-windows-gnullvm
2 parents 9ba00e0 + 9fc711b commit 3914f05

File tree

2 files changed

+4
-2
lines changed
  • src/ci/docker/host-x86_64

2 files changed

+4
-2
lines changed

src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ ENV RUST_CONFIGURE_ARGS \
4040
--enable-sanitizers \
4141
--disable-docs \
4242
--set llvm.download-ci-llvm=false \
43-
--set rust.llvm-tools=false
43+
--set rust.llvm-tools=false \
44+
--set target.aarch64-pc-windows-gnullvm.crt-static=false
4445
# LLVM cross tools are not installed into expected location so copying fails.
4546
# Probably will solve itself once this target can host itself on Windows.
4647
# --enable-full-tools \

src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ ENV RUST_CONFIGURE_ARGS \
4242
--enable-sanitizers \
4343
--disable-docs \
4444
--set llvm.download-ci-llvm=false \
45-
--set rust.llvm-tools=false
45+
--set rust.llvm-tools=false \
46+
--set target.x86_64-pc-windows-gnullvm.crt-static=false
4647
# LLVM cross tools are not installed into expected location so copying fails.
4748
# Probably will solve itself once these targets can host themselves on Windows.
4849
# --enable-full-tools \

0 commit comments

Comments
 (0)