diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 737412977..317534c0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,6 +74,8 @@ jobs: curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-protobuf-c-1.4.1-1-any.pkg.tar.zst curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-protobuf-21.9-1-any.pkg.tar.zst pacman --noconfirm -U mingw-w64-x86_64-protobuf-c-1.4.1-1-any.pkg.tar.zst mingw-w64-x86_64-protobuf-21.9-1-any.pkg.tar.zst + # Update binutils if MinGW due to https://github.com/rust-lang/rust/issues/112368 + pacman -Syu --needed mingw-w64-x86_64-gcc --noconfirm - name: build run: | ${{env.CCACHE_SETTINGS}} diff --git a/.github/workflows/depends.yml b/.github/workflows/depends.yml index 2c1f3d6ea..e5daa4e81 100644 --- a/.github/workflows/depends.yml +++ b/.github/workflows/depends.yml @@ -109,7 +109,8 @@ jobs: - name: install rust target # We can't use the latest Rust due to LLVM 17 not working with old `ld`s (such as in Ubuntu 20.04) for RISC-V # We could update ld (a pain), update Ubuntu (requires a large amount of changes), or downgrade Rust - run: rustup toolchain install 1.72; rustup default 1.72; rustup target add ${{ matrix.toolchain.rust_host }} + # We can't use Rust 1.70 due to LLVM 16 requiring ld >= 2.40 when building for Windows + run: rustup toolchain install 1.69; rustup default 1.69; rustup target add ${{ matrix.toolchain.rust_host }} - name: prepare w64-mingw32 if: ${{ matrix.toolchain.host == 'x86_64-w64-mingw32' || matrix.toolchain.host == 'i686-w64-mingw32' }} run: |