Merge #31

31: Update hongfuzz to ~2.0 (current master) r=PaulGrandperrin a=Mrmaxmeier fixes #30 Co-authored-by: Mrmaxmeier <[email protected]>
rust-fuzz · Mar 1, 2020 · 5939403 · 5939403
2 parents 48f4555 + 709a2e7
commit 5939403
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/build.rs b/build.rs
@@ -40,9 +40,9 @@ fn main() {
 
     // build honggfuzz command and hfuzz static library
     let status = Command::new(GNU_MAKE)
-        .args(&["-C", "honggfuzz", "honggfuzz", "libhfuzz/libhfuzz.a"])
+        .args(&["-C", "honggfuzz", "honggfuzz", "libhfuzz/libhfuzz.a", "libhfcommon/libhfcommon.a"])
         .status()
-        .expect("failed to run \"make -C honggfuzz hongfuzz libhfuzz/libhfuzz.a\"");
+        .expect("failed to run \"make -C honggfuzz hongfuzz libhfuzz/libhfuzz.a libhfcommon/libhfcommon.a\"");
     assert!(status.success());
 
     // copy hfuzz static library to output directory
@@ -51,6 +51,11 @@ fn main() {
         .status()
         .expect(&format!("failed to run \"cp honggfuzz/libhfuzz/libhfuzz.a {}\"", &out_dir));
     assert!(status.success());
+    let status = Command::new("cp")
+        .args(&["honggfuzz/libhfcommon/libhfcommon.a", &out_dir])
+        .status()
+        .expect(&format!("failed to run \"cp honggfuzz/libhfcommon/libhfcommon.a {}\"", &out_dir));
+    assert!(status.success());
 
     // copy honggfuzz executable to honggfuzz target directory
     let status = Command::new("cp")
@@ -61,5 +66,6 @@ fn main() {
 
     // tell cargo how to link final executable to hfuzz static library
     println!("cargo:rustc-link-lib=static={}", "hfuzz");
+    println!("cargo:rustc-link-lib=static={}", "hfcommon");
     println!("cargo:rustc-link-search=native={}", &out_dir);
 }
diff --git a/honggfuzz b/honggfuzz