From 624dfe8cd1b681a52d85e73cc6f19b958b4ed831 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 2 Nov 2021 14:00:20 +0800 Subject: [PATCH] upgrade to LLVM 12 --- Cargo.lock | 4 ++-- flake.nix | 10 +++++----- nac3artiq/Cargo.toml | 2 +- nac3core/Cargo.toml | 2 +- nac3standalone/Cargo.toml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f2ec461af..3e6406d06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,9 +439,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "llvm-sys" -version = "110.0.2" +version = "120.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7cc88ba864d592f52132ed3a19a97118fe16c92a63961f54b0ab7279c5407f" +checksum = "b4a810627ac62b396f5fd2214ba9bbd8748d4d6efdc4d2c1c1303ea7a75763ce" dependencies = [ "cc", "lazy_static", diff --git a/flake.nix b/flake.nix index d93982625..2c2b3f3c6 100644 --- a/flake.nix +++ b/flake.nix @@ -13,8 +13,8 @@ name = "nac3artiq"; src = self; cargoSha256 = "0cml3irmc72f42dqmka9w4l3k397b2rnns768vm132mh2zyv85lp"; - nativeBuildInputs = [ pkgs.python3 pkgs.llvm_11 ]; - buildInputs = [ pkgs.python3 pkgs.libffi pkgs.libxml2 pkgs.llvm_11 ]; + nativeBuildInputs = [ pkgs.python3 pkgs.llvm_12 ]; + buildInputs = [ pkgs.python3 pkgs.libffi pkgs.libxml2 pkgs.llvm_12 ]; cargoBuildFlags = [ "--package" "nac3artiq" ]; cargoTestFlags = [ "--package" "nac3core" "--package" "nac3artiq" ]; installPhase = @@ -30,9 +30,9 @@ devShell.x86_64-linux = pkgs.mkShell { name = "nac3-dev-shell"; buildInputs = with pkgs; [ - llvm_11 - clang_11 - lld_11 + llvm_12 + clang_12 + lld_12 cargo rustc libffi diff --git a/nac3artiq/Cargo.toml b/nac3artiq/Cargo.toml index a814fcdda..e73bbd316 100644 --- a/nac3artiq/Cargo.toml +++ b/nac3artiq/Cargo.toml @@ -11,6 +11,6 @@ crate-type = ["cdylib"] [dependencies] pyo3 = { version = "0.14", features = ["extension-module"] } rustpython-parser = { git = "https://github.com/m-labs/RustPython", branch = "parser-mod" } -inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm11-0"] } +inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm12-0"] } parking_lot = "0.11" nac3core = { path = "../nac3core" } diff --git a/nac3core/Cargo.toml b/nac3core/Cargo.toml index 68b7325b0..6f2f730f9 100644 --- a/nac3core/Cargo.toml +++ b/nac3core/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] num-bigint = "0.3" num-traits = "0.2" -inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm11-0"] } +inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm12-0"] } rustpython-parser = { git = "https://github.com/m-labs/RustPython", branch = "parser-mod" } itertools = "0.10.1" crossbeam = "0.8.1" diff --git a/nac3standalone/Cargo.toml b/nac3standalone/Cargo.toml index 5542d5f62..ed3ac1f3c 100644 --- a/nac3standalone/Cargo.toml +++ b/nac3standalone/Cargo.toml @@ -5,7 +5,7 @@ authors = ["M-Labs"] edition = "2018" [dependencies] -inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm11-0"] } +inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm12-0"] } rustpython-parser = { git = "https://github.com/m-labs/RustPython", branch = "parser-mod" } parking_lot = "0.11.1" nac3core = { path = "../nac3core" }