From fe6cdf8d63891a6ab9c8070238ebbf81656797f5 Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Sat, 2 Nov 2024 23:31:21 +0100
Subject: [PATCH] build: drop i686-linux-gnu target

---
 .github/workflows/guix.yml         |  1 -
 contrib/depends/toolchain.cmake.in | 10 ----------
 contrib/guix/guix-build            |  2 +-
 contrib/guix/libexec/build.sh      |  4 ----
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/.github/workflows/guix.yml b/.github/workflows/guix.yml
index 1b29b5c1..8f06f96a 100644
--- a/.github/workflows/guix.yml
+++ b/.github/workflows/guix.yml
@@ -32,7 +32,6 @@ jobs:
           - target: "aarch64-linux-gnu"
           - target: "arm-linux-gnueabihf"
           - target: "riscv64-linux-gnu"
-          - target: "i686-linux-gnu"
           - target: "x86_64-w64-mingw32"
           - target: "x86_64-w64-mingw32.installer"
           - target: "x86_64-apple-darwin"
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index 3a6eb11b..c072a4c6 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -152,16 +152,6 @@ if(ARCHITECTURE STREQUAL "riscv64")
     set(ARCH "rv64imafdc")
 endif()
 
-if(ARCHITECTURE STREQUAL "i686")
-  SET(ARCH_ID "i386")
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(BUILD_TAG "linux-x86")
-    SET(LINUX_32 ON)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    set(BUILD_TAG "win-x32")
-  endif()
-endif()
-
 if(ARCHITECTURE STREQUAL "x86_64")
   if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(BUILD_TAG "linux-x64")
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index d6ec1535..9ca564ea 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -79,7 +79,7 @@ mkdir -p "$VERSION_BASE"
 ################
 
 # Default to building for all supported HOSTs (overridable by environment)
-export HOSTS="${HOSTS:-i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf
+export HOSTS="${HOSTS:-x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf
                        x86_64-linux-gnu.no-tor-bundle
                        x86_64-linux-gnu.pack
                        riscv64-linux-gnu
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 3156986d..6190d8cf 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -173,7 +173,6 @@ case "$HOST" in
                 riscv64-linux-gnu)     echo /lib/ld-linux-riscv64-lp64d.so.1 ;;
                 powerpc64-linux-gnu)   echo /lib64/ld64.so.1;;
                 powerpc64le-linux-gnu) echo /lib64/ld64.so.2;;
-                i686-linux-gnu)        echo /lib/ld-linux.so.2 ;;
                 *)                     exit 1 ;;
             esac
         )
@@ -332,9 +331,6 @@ mkdir -p "$DISTSRC"
 
     LINUX_ARCH=""
     case "$HOST" in
-        i686-linux*)
-            LINUX_ARCH="-x86"
-            ;;
         aarch64-linux*)
             LINUX_ARCH="-arm64"
             ;;
-- 
2.52.0