Skip to content

Commit 825bb13

Browse files
committed
Enable LLVM tools for gnullvm dist
This issue has been fixed by <rust-lang#145763>.
1 parent 8df154b commit 825bb13

File tree

2 files changed

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

2 files changed

+4
-12
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,10 @@ ENV HOST=aarch64-pc-windows-gnullvm
3535
ENV NO_DOWNLOAD_CI_LLVM 1
3636

3737
ENV RUST_CONFIGURE_ARGS \
38-
--enable-extended \
38+
--enable-full-tools \
3939
--enable-profiler \
4040
--enable-sanitizers \
4141
--disable-docs \
42-
--set llvm.download-ci-llvm=false \
43-
--set rust.llvm-tools=false
44-
# LLVM cross tools are not installed into expected location so copying fails.
45-
# Probably will solve itself once this target can host itself on Windows.
46-
# --enable-full-tools \
42+
--set llvm.download-ci-llvm=false
4743

4844
ENV SCRIPT python3 ../x.py dist --host $HOST --target $HOST

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ ENV TARGETS=i686-pc-windows-gnullvm,x86_64-pc-windows-gnullvm
3737
ENV NO_DOWNLOAD_CI_LLVM 1
3838

3939
ENV RUST_CONFIGURE_ARGS \
40-
--enable-extended \
40+
--enable-full-tools \
4141
--enable-profiler \
4242
--enable-sanitizers \
4343
--disable-docs \
44-
--set llvm.download-ci-llvm=false \
45-
--set rust.llvm-tools=false
46-
# LLVM cross tools are not installed into expected location so copying fails.
47-
# Probably will solve itself once these targets can host themselves on Windows.
48-
# --enable-full-tools \
44+
--set llvm.download-ci-llvm=false
4945

5046
ENV SCRIPT python3 ../x.py dist --host $HOST --target $TARGETS

0 commit comments

Comments
 (0)