From f6d2eaacb4d23e1d9ec0e5e017d340877ccefad0 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Wed, 8 May 2024 12:53:12 +0100 Subject: [PATCH] Fix libafl_libfuzzer's compatibility with LLVM 14 (#2136) * Always use Rust's nm instead of host system one * Fix formatting * Fix formatting --- libafl_libfuzzer/build.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libafl_libfuzzer/build.rs b/libafl_libfuzzer/build.rs index d6022f62ff..de4e7bbdc1 100644 --- a/libafl_libfuzzer/build.rs +++ b/libafl_libfuzzer/build.rs @@ -93,14 +93,9 @@ fn main() { let target_libdir = String::from_utf8(target_libdir.stdout).unwrap(); let target_libdir = Path::new(target_libdir.trim()); - let rust_objcopy = target_libdir.join("../bin/llvm-objcopy"); // NOTE: depends on llvm-tools - let nm = if cfg!(target_os = "macos") { - // NOTE: depends on llvm-tools - target_libdir.join("../bin/llvm-nm") - } else { - // NOTE: we use system nm on linux because llvm-nm doesn't respect the encoding? - PathBuf::from("nm") - }; + // NOTE: depends on llvm-tools + let rust_objcopy = target_libdir.join("../bin/llvm-objcopy"); + let nm = target_libdir.join("../bin/llvm-nm"); let redefined_archive_path = custom_lib_dir.join("libFuzzer.a"); let redefined_symbols = custom_lib_dir.join("redefs.txt");