Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions cpython-unix/build-tcl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions pythonbuild/downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 1 addition & 5 deletions pythonbuild/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
Loading