From 1fca7108133213a96fc256395457732a97dc4f95 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Fri, 4 Feb 2022 11:49:02 +0100 Subject: [PATCH] llvm-config --libs only for apple (#522) * Fuck apple * fix fuzzbench_text --- fuzzers/fuzzbench_text/src/lib.rs | 2 +- libafl_cc/build.rs | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fuzzers/fuzzbench_text/src/lib.rs b/fuzzers/fuzzbench_text/src/lib.rs index 08caf50b29..c9499c01be 100644 --- a/fuzzers/fuzzbench_text/src/lib.rs +++ b/fuzzers/fuzzbench_text/src/lib.rs @@ -328,7 +328,7 @@ fn fuzz_binary( // This one is composed by two Feedbacks in OR let feedback = feedback_or!( // New maximization map feedback linked to the edges observer and the feedback state - MaxMapFeedback::new_tracking(&feedback_state, &edges_observer, true, false), + MaxMapFeedback::new_tracking(&feedback_state, &edges_observer, true, true), // Time feedback, this one does not need a feedback state TimeFeedback::new_with_observer(&time_observer) ); diff --git a/libafl_cc/build.rs b/libafl_cc/build.rs index c521b9605c..57f0c6f9f7 100644 --- a/libafl_cc/build.rs +++ b/libafl_cc/build.rs @@ -134,9 +134,15 @@ fn main() { .expect("Failed to execute llvm-config"); let cxxflags = str::from_utf8(&output.stdout).expect("Invalid llvm-config output"); - let output = Command::new(&llvm_config) + let mut cmd = Command::new(&llvm_config); + + #[cfg(target_vendor = "apple")] + { + cmd.args(&["--libs"]); + } + + let output = cmd .args(&["--ldflags"]) - .args(&["--libs"]) .output() .expect("Failed to execute llvm-config"); let ldflags = str::from_utf8(&output.stdout).expect("Invalid llvm-config output");