Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to LLVM 16 #31

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Update to LLVM 16 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions .github/workflows/build-test.yml
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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