From f8a697e3d455cb9935271329041a005217f6c00c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 19 Aug 2021 11:14:35 +0800 Subject: [PATCH] switch to LLVM 11 --- Cargo.lock | 53 ++++++++++++++++++++++++++++++++++++++++++--- nac3core/Cargo.toml | 3 +-- shell.nix | 2 +- 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ff33e7cf5..1d50ff1ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,8 @@ dependencies = [ "either", "inkwell_internals", "libc", - "llvm-sys", + "llvm-sys 100.2.1", + "llvm-sys 110.0.1", "once_cell", "parking_lot", "regex", @@ -421,7 +422,20 @@ dependencies = [ "lazy_static", "libc", "regex", - "semver", + "semver 0.9.0", +] + +[[package]] +name = "llvm-sys" +version = "110.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ede189444b8c78907e5d36da5dabcf153170fcff9c1dba48afc4b33c7e19f0" +dependencies = [ + "cc", + "lazy_static", + "libc", + "regex", + "semver 0.11.0", ] [[package]] @@ -599,6 +613,15 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + [[package]] name = "petgraph" version = "0.5.1" @@ -889,7 +912,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser", + "semver-parser 0.7.0", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser 0.10.2", ] [[package]] @@ -898,6 +930,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + [[package]] name = "siphasher" version = "0.3.5" @@ -966,6 +1007,12 @@ dependencies = [ "crunchy", ] +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + [[package]] name = "unic-char-property" version = "0.9.0" diff --git a/nac3core/Cargo.toml b/nac3core/Cargo.toml index c0581cc12..bbd553e4c 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 = ["llvm10-0"] } +inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm11-0"] } rustpython-parser = { git = "https://github.com/RustPython/RustPython", branch = "master" } itertools = "0.10.1" crossbeam = "0.8.1" @@ -17,4 +17,3 @@ rayon = "1.5.1" [dev-dependencies] test-case = "1.2.0" indoc = "1.0" - diff --git a/shell.nix b/shell.nix index 858e68b93..35be20556 100644 --- a/shell.nix +++ b/shell.nix @@ -4,6 +4,6 @@ in pkgs.stdenv.mkDerivation { name = "nac3-env"; buildInputs = with pkgs; [ - llvm_10 clang_10 cargo rustc libffi libxml2 clippy + llvm_11 clang_11 cargo rustc libffi libxml2 clippy ]; }