On Fri, Aug 15, 2025 at 11:13 AM Matthias Aßhauer <mha1993@xxxxxxx> wrote: > > diff --git a/ci/install-rust.sh b/ci/install-rust.sh > > index 141ceddb17cf..c22baa629ceb 100644 > > --- a/ci/install-rust.sh > > +++ b/ci/install-rust.sh > > @@ -28,6 +28,9 @@ if [ "$BITNESS" = "32" ]; then > > $CARGO_HOME/bin/rustup default --force-non-host $RUST_VERSION || exit $? > > else > > $CARGO_HOME/bin/rustup default $RUST_VERSION || exit $? > > + if [ "$CI_OS_NAME" = "windows" ]; then > > + $CARGO_HOME/bin/rustup target add x86_64-pc-windows-gnu || exit $? > > + fi > > fi > > > > . $CARGO_HOME/env > > diff --git a/config.mak.uname b/config.mak.uname > > index 3e26bb074a4b..a22703284b56 100644 > > --- a/config.mak.uname > > +++ b/config.mak.uname > > @@ -727,19 +727,26 @@ ifeq ($(uname_S),MINGW) > > prefix = /mingw32 > > HOST_CPU = i686 > > BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup > > + CARGO_BUILD_TARGET = i686-pc-windows-gnu > > endif > > ifeq (MINGW64,$(MSYSTEM)) > > prefix = /mingw64 > > HOST_CPU = x86_64 > > BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup > > + CARGO_BUILD_TARGET = x86_64-pc-windows-gnu > > I've said it when Johannes originally sent this patch[1], but it bears > repeating: The *-pc-windows-gnu targets will pass CI, but would mean > raising the required Windows version from 8.1 to 10. We'd want to use > the *-win7-windows-gnu targets[2] to keep Windows 8.1 supported. > > [1] > https://lore.kernel.org/git/pull.1980.git.git.1752784344.gitgitgadget@xxxxxxxxx/T/#ma10be2ed0a0e776b0af2fdd0de63d51ba51609e4 > [2] > https://doc.rust-lang.org/nightly/rustc/platform-support/win7-windows-gnu.html > > > else ifeq (CLANGARM64,$(MSYSTEM)) > > prefix = /clangarm64 > > HOST_CPU = aarch64 > > BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup > > + CARGO_BUILD_TARGET = aarch64-pc-windows-gnu > > As I've also mentioned before [1], this target doesn't seem to exist. The > correct target seems to be aarch64-pc-windows-gnullvm. [3] > > [3] https://doc.rust-lang.org/rustc/platform-support/windows-gnullvm.html I'll be happy to make that change for the next round.
