Skip to content

Commit

Permalink
[CI] Upgrade to clang 19
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed Jan 9, 2025
1 parent 240dae1 commit 16a555d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions CI/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def sources_list(snapshot, sections):
LLVM_REPO = (
"echo"
" deb [signed-by=/usr/share/keyrings/llvm.gpg]"
" https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-18 main"
" https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-19 main"
" > /etc/apt/sources.list.d/llvm.list"
)

Expand Down Expand Up @@ -96,8 +96,8 @@ def sources_list(snapshot, sections):
"apt-get install -y --no-install-recommends {}".format(
" ".join(
[
"clang-18",
"lld-18",
"clang-19",
"lld-19",
"git",
"make",
"patch",
Expand Down Expand Up @@ -178,14 +178,14 @@ def sources_list(snapshot, sections):
"apt-get install -y --no-install-recommends {}".format(
" ".join(
[
"llvm-18",
"llvm-19",
"make",
]
)
),
"apt-get clean",
"pip3 install cram==0.7",
"ln -s llvm-symbolizer-18 /usr/bin/llvm-symbolizer",
"ln -s llvm-symbolizer-19 /usr/bin/llvm-symbolizer",
],
},
}
Expand Down
4 changes: 2 additions & 2 deletions CI/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ def prefix(p, s):
raise Exception("Unknown variant: {}".format(variant))

if "osx" not in os:
environ["CC"] = "clang-18"
environ["CC"] = "clang-19"

if os.startswith("mingw"):
cpu = msys.msys_cpu(env.cpu)
Expand Down Expand Up @@ -481,7 +481,7 @@ def prefix(p, s):
environ[f"CARGO_TARGET_{TARGET}_RUSTFLAGS"] = (
f"-C link-arg=--target={target} "
+ f"-C link-arg={extra_link_arg} "
+ "-C link-arg=-fuse-ld=lld-18"
+ "-C link-arg=-fuse-ld=lld-19"
)
rustflags = environ.pop("RUSTFLAGS", None)
if rustflags:
Expand Down

0 comments on commit 16a555d

Please sign in to comment.