Skip to content

Commit a591003

Browse files
committed
Bring back i686-pc-windows-gnullvm target
1 parent dfe1b8c commit a591003

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,10 @@ auto:
686686
- name: dist-aarch64-llvm-mingw
687687
env:
688688
SCRIPT: python x.py dist bootstrap --include-default-paths
689+
# i686 has no dedicated job, build it here because this job is fast
689690
RUST_CONFIGURE_ARGS: >-
690691
--build=aarch64-pc-windows-gnullvm
692+
--target=aarch64-pc-windows-gnullvm,i686-pc-windows-gnullvm
691693
--enable-full-tools
692694
--enable-profiler
693695
DIST_REQUIRE_ALL_TOOLS: 1

src/ci/scripts/install-mingw.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ if isWindows && isKnownToBeMingwBuild; then
1616
*aarch64-llvm*)
1717
mingw_dir="clangarm64"
1818
mingw_archive="${LLVM_MINGW_ARCHIVE_AARCH64}"
19-
arch="aarch64"
2019
# Rustup defaults to AArch64 MSVC which has a hard time building Ring crate
2120
# for citool. MSVC jobs install special Clang build to solve that, but here
2221
# it would be an overkill. So we just use toolchain that doesn't have this
@@ -26,7 +25,6 @@ if isWindows && isKnownToBeMingwBuild; then
2625
*x86_64-llvm*)
2726
mingw_dir="clang64"
2827
mingw_archive="${LLVM_MINGW_ARCHIVE_X86_64}"
29-
arch="x86_64"
3028
;;
3129
*i686*)
3230
mingw_dir="mingw32"
@@ -64,7 +62,9 @@ if isWindows && isKnownToBeMingwBuild; then
6462
mv llvm-mingw-20251104-ucrt-$arch $mingw_dir
6563
# Temporary workaround: https://github.com/mstorsjo/llvm-mingw/issues/493
6664
mkdir -p $mingw_dir/bin
67-
ln -s $arch-w64-windows-gnu.cfg $mingw_dir/bin/$arch-pc-windows-gnu.cfg
65+
for arch in aarch64 i686 x86_64; do
66+
ln -s $arch-w64-windows-gnu.cfg $mingw_dir/bin/$arch-pc-windows-gnu.cfg
67+
done
6868
;;
6969
*)
7070
echo "Unrecognized archive type"

0 commit comments

Comments
 (0)