Skip to content

Commit b670cd8

Browse files
authored
apply disable-multiarch patch to all musl builds (#725)
Potential solve for #724
1 parent 55f3d50 commit b670cd8

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

cpython-unix/build-cpython.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,12 @@ fi
116116
# Clang 13 actually prints something with --print-multiarch, confusing CPython's
117117
# configure. This is reported as https://bugs.python.org/issue45405. We nerf the
118118
# check since we know what we're doing.
119-
if [ "${CC}" = "clang" ]; then
119+
if [[ "${CC}" = "clang" || "${CC}" = "musl-clang" ]]; then
120120
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
121121
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
122122
else
123123
patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
124124
fi
125-
elif [ "${CC}" = "musl-clang" ]; then
126-
# Similarly, this is a problem for musl Clang on Python 3.13+
127-
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
128-
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
129-
fi
130125
fi
131126

132127
# Python 3.11 supports using a provided Python to use during bootstrapping

0 commit comments

Comments
 (0)