Skip to content

Commit

Permalink
cmplog features -> plugins feature
Browse files Browse the repository at this point in the history
  • Loading branch information
brunoproduit committed Oct 31, 2023
1 parent 84f9605 commit e6d186c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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++
Expand Down
2 changes: 1 addition & 1 deletion cargo-afl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ tempfile = "3.8"

[features]
default = []
cmplog = []
plugins = []
6 changes: 3 additions & 3 deletions cargo-afl/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ 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());
}
}

fn build_afl(work_dir: &Path, base: Option<&Path>) {
let mut environment_variables = HashMap::<String, String>::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);
}
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit e6d186c

Please sign in to comment.