Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -821,14 +821,14 @@ auto:

- name: dist-i686-mingw
env:
# Disable RISCV target because building it OOMs.
RUST_CONFIGURE_ARGS: >-
--build=i686-pc-windows-gnu
--enable-full-tools
--set llvm.targets=AArch64;AMDGPU;ARM;BPF;Hexagon;LoongArch;MSP430;Mips;NVPTX;PowerPC;Sparc;SystemZ;WebAssembly;X86
--build=x86_64-pc-windows-gnu
--host=
--target=i686-pc-windows-gnu
--disable-docs
--set target.i686-pc-windows-gnu.linker=i686-w64-mingw32-gcc
SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
CODEGEN_BACKENDS: llvm
<<: *job-windows

- name: dist-x86_64-mingw
Expand Down
13 changes: 12 additions & 1 deletion src/ci/scripts/install-mingw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,17 @@ LLVM_MINGW_ARCHIVE_AARCH64="llvm-mingw-20251104-ucrt-aarch64.zip"
LLVM_MINGW_ARCHIVE_X86_64="llvm-mingw-20251104-ucrt-x86_64.zip"

if isWindows && isKnownToBeMingwBuild; then
case "${CI_JOB_NAME}" in
toolchains=
# i686-pc-windows-gnu is cross-compiled from x86_64-pc-windows-gnu, so we need
# the both toolchains
if [[ "${CI_JOB_NAME}" == *i686-mingw* ]]; then
toolchains=("${CI_JOB_NAME}" "x86_64-mingw")
else
toolchains=("${CI_JOB_NAME}")
fi

for toolchain in "${toolchains[@]}"; do
case "${toolchain}" in
*aarch64-llvm*)
mingw_dir="clangarm64"
mingw_archive="${LLVM_MINGW_ARCHIVE_AARCH64}"
Expand Down Expand Up @@ -81,4 +91,5 @@ if isWindows && isKnownToBeMingwBuild; then
# (see https://github.com/actions/runner-images/issues/12600)
/c/msys64/usr/bin/bash -lc ' '
fi
done
fi
Loading