Use latest LLVM for musl builds (#916)

closes #829

Author: jjhelmus

cpython-unix/build-tcl.sh

@@ -19,12 +19,14 @@ export PKG_CONFIG_PATH=${TOOLS_PATH}/deps/share/pkgconfig:${TOOLS_PATH}/deps/lib
 tar -xf tcl${TCL_VERSION}-src.tar.gz
 pushd tcl${TCL_VERSION}
 
+EXTRA_CONFIGURE=
 
 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')"
+		# tcl will use an internal implementation of certain POSIX function when
+		# cross-compiling. The implementation of strtoul create multiple definitions
+		# when linked against the static musl libc. Exclude the internal implementation.
+		EXTRA_CONFIGURE="${EXTRA_CONFIGURE} tcl_cv_strtoul_unbroken=ok"
 	fi
 
 	patch -p1 << 'EOF'
@@ -59,7 +61,8 @@ CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure \
     --host=${TARGET_TRIPLE} \
     --prefix=/tools/deps \
     --enable-shared"${STATIC:+=no}" \
-    --enable-threads
+    --enable-threads \
+    ${EXTRA_CONFIGURE}
 
 make -j ${NUM_CPUS} DYLIB_INSTALL_DIR=@rpath
 make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out DYLIB_INSTALL_DIR=@rpath

pythonbuild/downloads.py

@@ -176,12 +176,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-21-aarch64-linux": {
         "url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20251029/llvm-21.1.4+20251029-gnu_only-aarch64-unknown-linux-gnu.tar.zst",

pythonbuild/utils.py

@@ -475,11 +475,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-21-x86_64-linux"
+        return "llvm-21-x86_64-linux"
     elif host_platform == "linux_aarch64":
         return "llvm-21-aarch64-linux"
     elif host_platform == "macos_arm64":