Skip to content

Commit 8ab167c

Browse files
committed
downloads: upgrade LLVM toolchain 14.0.3 -> 15.0.3 on non-musl Linux
MUSL isn't liking LLVM 15 for some reason. I don't have the patience to debug it right now. Let's move the glibc distributions to LLVM 15 so we can at least get those modern.
1 parent bbd8362 commit 8ab167c

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

pythonbuild/downloads.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,18 @@
159159
"licenses": ["MIT"],
160160
"license_file": "LICENSE.libxcb.txt",
161161
},
162-
"llvm-x86_64-linux": {
162+
"llvm-14-x86_64-linux": {
163163
"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",
164164
"size": 158614671,
165165
"sha256": "04cb77c660f09df017a57738ae9635ef23a506024789f2f18da1304b45af2023",
166166
"version": "14.0.3+20220508",
167167
},
168+
"llvm-15-x86_64-linux": {
169+
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20230114/llvm-15.0.7+20230114-gnu_only-x86_64-unknown-linux-gnu.tar.zst",
170+
"size": 185056557,
171+
"sha256": "342c9055742335612589b526b19af7a8dd1fa279fddc0e7bf95523fc64a9a2dd",
172+
"version": "15.0.7+20230114",
173+
},
168174
"llvm-aarch64-macos": {
169175
"url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20230114/llvm-15.0.7+20230114-aarch64-apple-darwin.tar.zst",
170176
"size": 87441488,

pythonbuild/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,11 @@ def sort_key(v):
392392

393393
def clang_toolchain(host_platform: str, target_triple: str) -> str:
394394
if host_platform == "linux64":
395-
return "llvm-x86_64-linux"
395+
# musl currently has issues with LLVM 15+.
396+
if "musl" in target_triple:
397+
return "llvm-14-x86_64-linux"
398+
else:
399+
return "llvm-15-x86_64-linux"
396400
elif host_platform == "macos":
397401
if platform.mac_ver()[2] == "arm64":
398402
return "llvm-aarch64-macos"

0 commit comments

Comments
 (0)