Merge branch 'master' into master

Author: vanhauser-thc

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 0.15.23
+
+- Internal refactor. The changes should not be noticeable to end users. If you experience breakage, please open an [issue](https://github.com/rust-fuzz/afl.rs/issues).
+
 ## 0.15.22
 
 - Go back to conventional publishing. Attempting to use trusted publishing caused the AFLplusplus submodule to not be included.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "afl"
-version = "0.15.22"
+version = "0.15.23"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [

afl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-afl"
-version = "0.15.22"
+version = "0.15.23"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [

cargo-afl/Cargo.toml

@@ -55,10 +55,6 @@ pub fn object_file_path() -> Result<PathBuf> {
     afl_llvm_dir().map(|path| path.join("libafl-llvm-rt.o"))
 }
 
-pub fn archive_file_path() -> Result<PathBuf> {
-    afl_llvm_dir().map(|path| path.join("libafl-llvm-rt.a"))
-}
-
 pub fn plugins_available() -> Result<bool> {
     let afl_llvm_dir = afl_llvm_dir()?;
     for result in afl_llvm_dir

cargo-afl/src/common.rs

@@ -10,12 +10,6 @@ use super::common;
 
 const AFL_SRC_PATH: &str = "AFLplusplus";
 
-// https://github.com/rust-fuzz/afl.rs/issues/148
-#[cfg(target_os = "macos")]
-static AR_CMD: &str = "/usr/bin/ar";
-#[cfg(not(target_os = "macos"))]
-static AR_CMD: &str = "ar";
-
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Default, Parser)]
 #[clap(after_help = "\
@@ -37,8 +31,8 @@ pub struct Args {
 }
 
 pub fn config(args: &Args) -> Result<()> {
-    let archive_file_path = common::archive_file_path()?;
-    if !args.force && archive_file_path.exists() && args.plugins == common::plugins_available()? {
+    let object_file_path = common::object_file_path()?;
+    if !args.force && object_file_path.exists() && args.plugins == common::plugins_available()? {
         let version = common::afl_rustc_version()?;
         bail!(
             "AFL LLVM runtime was already built for Rust {version}; run `cargo afl config --build \
@@ -129,26 +123,11 @@ fn build_afl(args: &Args, work_dir: &Path) -> Result<()> {
     Ok(())
 }
 
-fn build_afl_llvm_runtime(args: &Args, work_dir: &Path) -> Result<()> {
+fn build_afl_llvm_runtime(_args: &Args, work_dir: &Path) -> Result<()> {
     let object_file_path = common::object_file_path()?;
     let _: u64 = std::fs::copy(work_dir.join("afl-compiler-rt.o"), &object_file_path)
         .with_context(|| "could not copy object file")?;
 
-    let archive_file_path = common::archive_file_path()?;
-    let mut command = Command::new(AR_CMD);
-    command
-        .arg("r")
-        .arg(archive_file_path)
-        .arg(object_file_path);
-
-    if !args.verbose {
-        command.stdout(Stdio::null());
-        command.stderr(Stdio::null());
-    }
-
-    let success = command.status().as_ref().is_ok_and(ExitStatus::success);
-    ensure!(success, "could not run 'ar'");
-
     Ok(())
 }
 

cargo-afl/src/config.rs

@@ -124,7 +124,7 @@ fn main() {
     };
 
     if !matches!(afl_args.subcmd, Some(AflSubcommand::Config(..)))
-        && !common::archive_file_path().unwrap().exists()
+        && !common::object_file_path().unwrap().exists()
     {
         let version = common::afl_rustc_version().unwrap();
         eprintln!(
@@ -347,9 +347,8 @@ where
     let mut rustdocflags = rustflags.clone();
 
     rustflags.push_str(&format!(
-        "-l afl-llvm-rt \
-         -L {} ",
-        common::afl_llvm_dir().unwrap().display()
+        "-Clink-arg={} ",
+        common::object_file_path().unwrap().display()
     ));
 
     // add user provided flags