Skip to content

Commit 6efddde

Browse files
committed
Remove multiarch patch
--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
1 parent f322ad6 commit 6efddde

File tree

3 files changed

+0
-45
lines changed

3 files changed

+0
-45
lines changed

cpython-unix/build-cpython.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,6 @@ elif [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_12}" ]; then
116116
patch -p1 -i ${ROOT}/patch-cpython-configure-target-triple-musl-3.12.patch
117117
fi
118118

119-
# Clang 13 actually prints something with --print-multiarch, confusing CPython's
120-
# configure. This is reported as https://bugs.python.org/issue45405. We nerf the
121-
# check since we know what we're doing.
122-
if [[ "${CC}" = "clang" || "${CC}" = "musl-clang" ]]; then
123-
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
124-
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
125-
else
126-
patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
127-
fi
128-
fi
129-
130119
# Python 3.11 supports using a provided Python to use during bootstrapping
131120
# (e.g. freezing). Normally it only uses this Python during cross-compiling.
132121
# This patch forces always using it. See comment related to

cpython-unix/patch-disable-multiarch-13.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

cpython-unix/patch-disable-multiarch.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)