From 687d9040595977b79b60061039f658c3ba36f6d6 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sun, 18 Aug 2024 01:45:01 +0200 Subject: [PATCH] build: drop support for 32-bit windows target --- .github/workflows/depends.yml | 5 +---- contrib/gitian/gitian-win.yml | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/depends.yml b/.github/workflows/depends.yml index 3ee6067482..ab17a2ace9 100644 --- a/.github/workflows/depends.yml +++ b/.github/workflows/depends.yml @@ -38,9 +38,6 @@ jobs: - name: "ARM v8" host: "aarch64-linux-gnu" packages: "python3 gperf g++-aarch64-linux-gnu" - - name: "i686 Win" - host: "i686-w64-mingw32" - packages: "python3 g++-mingw-w64-i686" - name: "i686 Linux" host: "i686-pc-linux-gnu" packages: "gperf cmake g++-multilib python3-zmq" @@ -96,7 +93,7 @@ jobs: - name: install dependencies run: sudo apt update; sudo apt -y install build-essential libtool cmake autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache ${{ matrix.toolchain.packages }} - name: prepare w64-mingw32 - if: ${{ matrix.toolchain.host == 'x86_64-w64-mingw32' || matrix.toolchain.host == 'i686-w64-mingw32' }} + if: ${{ matrix.toolchain.host == 'x86_64-w64-mingw32' }} run: | sudo update-alternatives --set ${{ matrix.toolchain.host }}-g++ $(which ${{ matrix.toolchain.host }}-g++-posix) sudo update-alternatives --set ${{ matrix.toolchain.host }}-gcc $(which ${{ matrix.toolchain.host }}-gcc-posix) diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index 4c607898eb..c3498f3884 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -22,12 +22,6 @@ packages: - "python" - "cmake" alternatives: -- - package: "i686-w64-mingw32-g++" - path: "/usr/bin/i686-w64-mingw32-g++-posix" -- - package: "i686-w64-mingw32-gcc" - path: "/usr/bin/i686-w64-mingw32-gcc-posix" - package: "x86_64-w64-mingw32-g++" path: "/usr/bin/x86_64-w64-mingw32-g++-posix" @@ -40,7 +34,7 @@ remotes: files: [] script: | WRAP_DIR=$HOME/wrapped - HOSTS="i686-w64-mingw32 x86_64-w64-mingw32" + HOSTS="x86_64-w64-mingw32" FAKETIME_HOST_PROGS="windres objcopy" FAKETIME_PROGS="date zip" HOST_CFLAGS="-O2 -g"