diff --git a/fuzzers/libfuzzer_libpng_launcher/Makefile.toml b/fuzzers/libfuzzer_libpng_launcher/Makefile.toml index a044b1cad8..80d6353529 100644 --- a/fuzzers/libfuzzer_libpng_launcher/Makefile.toml +++ b/fuzzers/libfuzzer_libpng_launcher/Makefile.toml @@ -58,7 +58,7 @@ windows_alias = "unsupported" [tasks.lib_unix] script_runner="@shell" script=''' -cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes +cd libpng-1.6.37 && CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes cd "${PROJECT_DIR}" make -C libpng-1.6.37 CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" LIBTOOL=${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_libtool ''' diff --git a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs b/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs index 433f3b66cc..f8c103e9e5 100644 --- a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs +++ b/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs @@ -16,10 +16,14 @@ pub fn main() { Configuration::GenerateCoverageMap, Configuration::CmpLog, ])) - .add_configuration(Configuration::UndefinedBehaviorSanitizer) - .add_configuration(Configuration::AddressSanitizer) - // .add_arg("-fsanitize-coverage=trace-pc-guard,trace-cmp") - // .add_arg("-fsanitize=address") + .add_configuration(Configuration::Compound(vec![ + Configuration::GenerateCoverageMap, + Configuration::AddressSanitizer, + ])) + .add_configuration(Configuration::Compound(vec![ + Configuration::GenerateCoverageMap, + Configuration::UndefinedBehaviorSanitizer, + ])) .run() .expect("Failed to run the wrapped libtool") { diff --git a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs b/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs index e5802d4683..37a0b4692b 100644 --- a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs +++ b/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs @@ -29,10 +29,14 @@ pub fn main() { Configuration::GenerateCoverageMap, Configuration::CmpLog, ])) - .add_configuration(Configuration::UndefinedBehaviorSanitizer) - .add_configuration(Configuration::AddressSanitizer) - // .add_arg("-fsanitize-coverage=trace-pc-guard,trace-cmp") - // .add_arg("-fsanitize=address") + .add_configuration(Configuration::Compound(vec![ + Configuration::GenerateCoverageMap, + Configuration::AddressSanitizer, + ])) + .add_configuration(Configuration::Compound(vec![ + Configuration::GenerateCoverageMap, + Configuration::UndefinedBehaviorSanitizer, + ])) .run() .expect("Failed to run the wrapped compiler") { diff --git a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs b/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs index 3902559afe..ba0927408d 100644 --- a/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs +++ b/fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs @@ -16,10 +16,14 @@ pub fn main() { Configuration::GenerateCoverageMap, Configuration::CmpLog, ])) - .add_configuration(Configuration::UndefinedBehaviorSanitizer) - .add_configuration(Configuration::AddressSanitizer) - // .add_arg("-fsanitize-coverage=trace-pc-guard,trace-cmp") - // .add_arg("-fsanitize=address") + .add_configuration(Configuration::Compound(vec![ + Configuration::GenerateCoverageMap, + Configuration::AddressSanitizer, + ])) + .add_configuration(Configuration::Compound(vec![ + Configuration::GenerateCoverageMap, + Configuration::UndefinedBehaviorSanitizer, + ])) .run() .expect("Failed to run the wrapped libtool") {