From e6d186c6cf7dc1aef61fe79ee07c2eb999436338 Mon Sep 17 00:00:00 2001 From: Bruno Produit Date: Tue, 31 Oct 2023 09:46:29 +0100 Subject: [PATCH] cmplog features -> plugins feature --- .github/workflows/rust.yml | 4 ++-- cargo-afl/Cargo.toml | 2 +- cargo-afl/build.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index cdd01a184..9786880a1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -34,11 +34,11 @@ jobs: matrix: environment: [ubuntu-latest, macos-latest] toolchain: [stable, nightly] - features: [default, cmplog] + features: [default, plugins] cc: [cc, clang] exclude: - toolchain: stable - features: cmplog + features: plugins include: - cc: cc cxx: c++ diff --git a/cargo-afl/Cargo.toml b/cargo-afl/Cargo.toml index 0e6033922..99bc2215a 100644 --- a/cargo-afl/Cargo.toml +++ b/cargo-afl/Cargo.toml @@ -35,4 +35,4 @@ tempfile = "3.8" [features] default = [] -cmplog = [] +plugins = [] diff --git a/cargo-afl/build.rs b/cargo-afl/build.rs index fe03d2151..ea0a821ff 100644 --- a/cargo-afl/build.rs +++ b/cargo-afl/build.rs @@ -62,7 +62,7 @@ fn main() { build_afl(&work_dir, base.as_deref()); build_afl_llvm_runtime(&work_dir, base.as_deref()); - if cfg!(feature = "cmplog") { + if cfg!(feature = "plugins") { copy_afl_llvm_plugins(&work_dir, base.as_deref()); } } @@ -70,7 +70,7 @@ fn main() { fn build_afl(work_dir: &Path, base: Option<&Path>) { let mut environment_variables = HashMap::::new(); - if cfg!(feature = "cmplog") { + if cfg!(feature = "plugins") { let llvm_config = check_llvm_and_get_config(); environment_variables.insert("LLVM_CONFIG".to_string(), llvm_config); } @@ -138,7 +138,7 @@ fn check_llvm_and_get_config() -> String { // Make sure we are on nightly for the -Z flags assert!( rustc_version::version_meta().unwrap().channel == rustc_version::Channel::Nightly, - "cargo-afl must be compiled with nightly for the cmplog feature" + "cargo-afl must be compiled with nightly for the plugins feature" ); let version_meta = rustc_version::version_meta().unwrap(); let llvm_version = version_meta.llvm_version.unwrap().major.to_string();