Skip to content

Commit 577e181

Browse files
committed
Enable LLVM download from CI for gnullvm dist
It no longer fails with an error locally.
1 parent 825bb13 commit 577e181

File tree

2 files changed

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

2 files changed

+2
-20
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,10 @@ ENV CC_aarch64_pc_windows_gnullvm=aarch64-w64-mingw32-clang \
2626

2727
ENV HOST=aarch64-pc-windows-gnullvm
2828

29-
# We are bootstrapping this target and cannot use previously built artifacts.
30-
# Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"`
31-
# despite no such directory existing:
32-
# $ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1
33-
# llvm
34-
# stage2
35-
ENV NO_DOWNLOAD_CI_LLVM 1
36-
3729
ENV RUST_CONFIGURE_ARGS \
3830
--enable-full-tools \
3931
--enable-profiler \
4032
--enable-sanitizers \
41-
--disable-docs \
42-
--set llvm.download-ci-llvm=false
33+
--disable-docs
4334

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

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,10 @@ ENV CC_i686_pc_windows_gnullvm=i686-w64-mingw32-clang \
2828
ENV HOST=x86_64-pc-windows-gnullvm
2929
ENV TARGETS=i686-pc-windows-gnullvm,x86_64-pc-windows-gnullvm
3030

31-
# We are bootstrapping this target and cannot use previously built artifacts.
32-
# Without this option Clang is given `"-I/checkout/obj/build/aarch64-pc-windows-gnullvm/ci-llvm/include"`
33-
# despite no such directory existing:
34-
# $ ls obj/dist-windows-gnullvm/build/aarch64-pc-windows-gnullvm/ -1
35-
# llvm
36-
# stage2
37-
ENV NO_DOWNLOAD_CI_LLVM 1
38-
3931
ENV RUST_CONFIGURE_ARGS \
4032
--enable-full-tools \
4133
--enable-profiler \
4234
--enable-sanitizers \
43-
--disable-docs \
44-
--set llvm.download-ci-llvm=false
35+
--disable-docs
4536

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

0 commit comments

Comments
 (0)