Skip to content

Commit 7c3c95d

Browse files
committed
Apply multiarch patch more broadly
1 parent be59689 commit 7c3c95d

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

cpython-unix/build-cpython-host.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ if [ "${CC}" = "clang" ]; then
4545
else
4646
patch -p1 -i ${ROOT}/patch-disable-multiarch-legacy.patch
4747
fi
48+
elif [ "${CC}" = "musl-clang" ]; then
49+
# This appears to also be a problem for musl builds on 3.13.
50+
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
51+
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
52+
fi
4853
fi
4954

5055
autoconf

cpython-unix/build-cpython.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ if [ "${CC}" = "clang" ]; then
117117
else
118118
patch -p1 -i ${ROOT}/patch-disable-multiarch-legacy.patch
119119
fi
120+
elif [ "${CC}" = "musl-clang" ]; then
121+
# This appears to also be a problem for musl builds on 3.13.
122+
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
123+
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
124+
fi
120125
fi
121126

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

0 commit comments

Comments
 (0)