Skip to content

Commit

Permalink
Update to LLVM 16
Browse files Browse the repository at this point in the history
Rust recently updated to LLVM 16 (rust-lang/rust#107224) and the change
is likely to be provided in next nightly builds.
  • Loading branch information
vadorovsky committed Mar 20, 2023
1 parent f06a6a1 commit 7bd2fc2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- "stable"
- "beta"
- "nightly"
llvm: ["15", "rustc"]
llvm: ["16", "rustc"]
name: "rustc: ${{ matrix.rust }}, llvm: ${{ matrix.llvm }}"

env:
Expand Down Expand Up @@ -80,9 +80,9 @@ jobs:
shell: bash
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
echo -e "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main\n" | sudo tee /etc/apt/sources.list.d/llvm.list
echo -e "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main\n" | sudo tee /etc/apt/sources.list.d/llvm.list
sudo apt-get update
sudo apt-get install llvm-15-tools
sudo apt-get install llvm-16-tools
- name: Build
run: cargo build --verbose ${CARGO_ARGS}
Expand Down
17 changes: 15 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ libc = "0.2"
thiserror = { version = "1.0", optional = true }
ar = { version = "0.8", optional = true }
log = { version = "0.4", optional = true }
llvm-sys = { version = "150", optional = true }
llvm-sys = { version = "160", optional = true }
aya-rustc-llvm-proxy = { version = "0.5.0", optional = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn run_mode(mode: &'static str) {
config.target_rustcflags = Some(rustc_flags);
if let Ok(filecheck) = which("FileCheck") {
config.llvm_filecheck = Some(filecheck)
} else if let Ok(filecheck) = which("FileCheck-15") {
} else if let Ok(filecheck) = which("FileCheck-16") {
config.llvm_filecheck = Some(filecheck)
} else {
panic!("no FileCheck binary found");
Expand Down

0 comments on commit 7bd2fc2

Please sign in to comment.