From 74cbbe0092d6b0ad83d513852566fba9d6696862 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Fri, 12 Mar 2021 16:38:20 +0100 Subject: [PATCH] remove linker hack --- src/bin/cargo-hfuzz.rs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/bin/cargo-hfuzz.rs b/src/bin/cargo-hfuzz.rs index 6d76d85..216c760 100644 --- a/src/bin/cargo-hfuzz.rs +++ b/src/bin/cargo-hfuzz.rs @@ -129,19 +129,6 @@ fn hfuzz_run(mut args: T, crate_root: &Path, build_type: &BuildType) where T: fn hfuzz_build(args: T, crate_root: &Path, build_type: &BuildType) where T: std::iter::Iterator { let honggfuzz_target = env::var("CARGO_TARGET_DIR").unwrap_or_else(|_| HONGGFUZZ_TARGET.into()); - // HACK: temporary fix, see https://github.com/rust-lang/rust/issues/53945#issuecomment-426824324 - let use_gold_linker: bool = match Command::new("which") // check if the gold linker is available - .args(&["ld.gold"]) - .status() { - Err(_) => false, - Ok(status) => { - match status.code() { - Some(0) => true, - _ => false - } - } - }; - let mut rustflags = "\ --cfg fuzzing \ -C debug-assertions \ @@ -194,11 +181,6 @@ fn hfuzz_build(args: T, crate_root: &Path, build_type: &BuildType) where T: s -C llvm-args=-sanitizer-coverage-trace-compares \ "); } - - // HACK: temporary fix, see https://github.com/rust-lang/rust/issues/53945#issuecomment-426824324 - if use_gold_linker { - rustflags.push_str("-Clink-arg=-fuse-ld=gold "); - } } } }