Skip to content

Commit 931009e

Browse files
committed
Attempt to set multiarch to a constant instead of disabling
1 parent 7c3c95d commit 931009e

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

cpython-unix/build-cpython.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ if [ "${CC}" = "clang" ]; then
120120
elif [ "${CC}" = "musl-clang" ]; then
121121
# This appears to also be a problem for musl builds on 3.13.
122122
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
123-
patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
123+
patch -p1 -i ${ROOT}/patch-musl-multiarch-13.patch
124124
fi
125125
fi
126126

cpython-unix/build.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ def build_cpython_host(
436436
"build-cpython-host.sh",
437437
"patch-disable-multiarch.patch",
438438
"patch-disable-multiarch-13.patch",
439+
"patch-musl-multiarch-13.patch",
439440
"patch-disable-multiarch-legacy.patch",
440441
}
441442
for s in sorted(support):
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff -u 13-a/configure.ac 13-b/configure.ac
2+
--- 13-a/configure.ac 2024-05-08 05:21:00.000000000 -0400
3+
+++ 13-b/configure.ac 2024-05-19 07:42:23.294762624 -0400
4+
@@ -1090,12 +1090,7 @@
5+
dnl architecture. PLATFORM_TRIPLET will be a pair or single value for these
6+
dnl platforms.
7+
AC_MSG_CHECKING([for multiarch])
8+
-AS_CASE([$ac_sys_system],
9+
- [Darwin*], [MULTIARCH=""],
10+
- [iOS], [MULTIARCH=""],
11+
- [FreeBSD*], [MULTIARCH=""],
12+
- [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
13+
-)
14+
+MULTIARCH=x86_64-linux-musl
15+
AC_SUBST([MULTIARCH])
16+
17+
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then

0 commit comments

Comments
 (0)