diff options
| author | Mateusz Mikuła <oss@mateuszmikula.dev> | 2025-08-23 14:28:48 +0200 |
|---|---|---|
| committer | Mateusz Mikuła <oss@mateuszmikula.dev> | 2025-08-23 16:46:14 +0200 |
| commit | 825bb13e1f05ab9ed3dc5df55d9efee291fd3604 (patch) | |
| tree | f4d72b20edc26fbcc764daf0403d1508d325e5fe /src/ci | |
| parent | 8df154bffddcb6bbb543ad69aff971795c5adbc2 (diff) | |
| download | rust-825bb13e1f05ab9ed3dc5df55d9efee291fd3604.tar.gz rust-825bb13e1f05ab9ed3dc5df55d9efee291fd3604.zip | |
Enable LLVM tools for gnullvm dist
This issue has been fixed by <https://github.com/rust-lang/rust/pull/145763>.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile | 8 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile b/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile index cdbc1cda025..5a388a5ac37 100644 --- a/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-aarch64-windows-gnullvm/Dockerfile @@ -35,14 +35,10 @@ ENV HOST=aarch64-pc-windows-gnullvm ENV NO_DOWNLOAD_CI_LLVM 1 ENV RUST_CONFIGURE_ARGS \ - --enable-extended \ + --enable-full-tools \ --enable-profiler \ --enable-sanitizers \ --disable-docs \ - --set llvm.download-ci-llvm=false \ - --set rust.llvm-tools=false -# LLVM cross tools are not installed into expected location so copying fails. -# Probably will solve itself once this target can host itself on Windows. -# --enable-full-tools \ + --set llvm.download-ci-llvm=false ENV SCRIPT python3 ../x.py dist --host $HOST --target $HOST diff --git a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile index 1ee3951beb5..72f7b356b5d 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-windows-gnullvm/Dockerfile @@ -37,14 +37,10 @@ ENV TARGETS=i686-pc-windows-gnullvm,x86_64-pc-windows-gnullvm ENV NO_DOWNLOAD_CI_LLVM 1 ENV RUST_CONFIGURE_ARGS \ - --enable-extended \ + --enable-full-tools \ --enable-profiler \ --enable-sanitizers \ --disable-docs \ - --set llvm.download-ci-llvm=false \ - --set rust.llvm-tools=false -# LLVM cross tools are not installed into expected location so copying fails. -# Probably will solve itself once these targets can host themselves on Windows. -# --enable-full-tools \ + --set llvm.download-ci-llvm=false ENV SCRIPT python3 ../x.py dist --host $HOST --target $TARGETS |