From 074411256bef6dfe2814f54d6c5fc19d68ef8b95 Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Mon, 27 Oct 2025 16:23:20 -0400 Subject: [PATCH 1/2] Use latest LLVM for musl builds (fixes #829) --- pythonbuild/downloads.py | 6 ------ pythonbuild/utils.py | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py index 9cc4f9d8..5299b332 100644 --- a/pythonbuild/downloads.py +++ b/pythonbuild/downloads.py @@ -185,12 +185,6 @@ "licenses": ["MIT"], "license_file": "LICENSE.libxcb.txt", }, - "llvm-14-x86_64-linux": { - "url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20220508/llvm-14.0.3+20220508-gnu_only-x86_64-unknown-linux-gnu.tar.zst", - "size": 158614671, - "sha256": "04cb77c660f09df017a57738ae9635ef23a506024789f2f18da1304b45af2023", - "version": "14.0.3+20220508", - }, # Remember to update LLVM_URL in src/release.rs whenever upgrading. "llvm-20-aarch64-linux": { "url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20250511/llvm-20.1.4+20250511-gnu_only-aarch64-unknown-linux-gnu.tar.zst", diff --git a/pythonbuild/utils.py b/pythonbuild/utils.py index 9e581c5b..6134d581 100644 --- a/pythonbuild/utils.py +++ b/pythonbuild/utils.py @@ -477,11 +477,7 @@ def sort_key(v): def clang_toolchain(host_platform: str, target_triple: str) -> str: if host_platform == "linux_x86_64": - # musl currently has issues with LLVM 15+. - if "musl" in target_triple: - return "llvm-14-x86_64-linux" - else: - return "llvm-20-x86_64-linux" + return "llvm-20-x86_64-linux" elif host_platform == "linux_aarch64": return "llvm-20-aarch64-linux" elif host_platform == "macos_arm64": From 42e8898b6b4df39a64f7f4db8df7156e4ac5059c Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Mon, 27 Oct 2025 17:35:15 -0400 Subject: [PATCH 2/2] see if this is still needed --- cpython-unix/build-tcl.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cpython-unix/build-tcl.sh b/cpython-unix/build-tcl.sh index bfbc22fa..70691fd7 100755 --- a/cpython-unix/build-tcl.sh +++ b/cpython-unix/build-tcl.sh @@ -21,12 +21,6 @@ pushd tcl${TCL_VERSION} if [ -n "${STATIC}" ]; then - if echo "${TARGET_TRIPLE}" | grep -q -- "-unknown-linux-musl"; then - # tcl misbehaves when performing static musl builds - # `checking whether musl-clang accepts -g...` fails with a duplicate definition error - TARGET_TRIPLE="$(echo "${TARGET_TRIPLE}" | sed -e 's/-unknown-linux-musl/-unknown-linux-gnu/g')" - fi - patch -p1 << 'EOF' diff --git a/unix/Makefile.in b/unix/Makefile.in --- a/unix/Makefile.in