Remove multiarch patch (#917)

--print-multiarch reporting an incorrect triple was a bug in LLVM that
was fixed. With the project now using LLVM 21+ (#916) the patches to
remove this check during configuration are no necessary.

closes #865

Author: jjhelmus

cpython-unix/build-cpython-host.sh

@@ -34,17 +34,6 @@ tar -xf Python-${PYTHON_VERSION}.tar.xz
 
 pushd "Python-${PYTHON_VERSION}"
 
-# Clang 13 actually prints something with --print-multiarch, confusing CPython's
-# configure. This is reported as https://bugs.python.org/issue45405. We nerf the
-# check since we know what we're doing.
-if [[ "${CC}" = "clang" || "${CC}" = "musl-clang" ]]; then
-  if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
-    patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
-  else
-    patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
-  fi
-fi
-
 autoconf
 
 # When cross-compiling, we need to build a host Python that has working zlib

cpython-unix/build-cpython.sh

@@ -116,17 +116,6 @@ elif [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_12}" ]; then
     patch -p1 -i ${ROOT}/patch-cpython-configure-target-triple-musl-3.12.patch
 fi
 
-# Clang 13 actually prints something with --print-multiarch, confusing CPython's
-# configure. This is reported as https://bugs.python.org/issue45405. We nerf the
-# check since we know what we're doing.
-if [[ "${CC}" = "clang" || "${CC}" = "musl-clang" ]]; then
-    if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
-        patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
-    else
-        patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
-    fi
-fi
-
 # Python 3.11 supports using a provided Python to use during bootstrapping
 # (e.g. freezing). Normally it only uses this Python during cross-compiling.
 # This patch forces always using it. See comment related to

cpython-unix/build.py

@@ -428,8 +428,6 @@ def build_cpython_host(
 
         support = {
             "build-cpython-host.sh",
-            "patch-disable-multiarch.patch",
-            "patch-disable-multiarch-13.patch",
         }
         for s in sorted(support):
             build_env.copy_file(SUPPORT / s)