Reliably compile z3 for all platforms including Windows

Cargo.toml

@@ -134,7 +134,9 @@ unicorn-engine = "2.0.1" # Used in libafl_unicorn
 uuid = { version = "1.18.0", features = ["serde", "v4"] }
 which = "8.0.0"
 windows = "0.59.0"
-z3 = { version = "0.18.2", default-features = false }
+z3 = { git = "https://github.com/prove-rs/z3.rs", rev = "z3-v0.18.2", default-features = false, features = [
+  "bundled",
+] }
 fs2 = "0.4.3" # Used by OnDisk Corpus for file locking
 
 [workspace.lints.rust]

crates/libafl/Cargo.toml

@@ -293,6 +293,8 @@ regex-syntax = { version = "0.8.4", optional = true } # For nautilus
 
 fs2 = { workspace = true, optional = true } # used by OnDisk Corpus for file locking
 
+z3 = { workspace = true, optional = true } # for concolic mutation
+
 # optional-dev deps (change when target.'cfg(accessible(::std))'.test-dependencies will be stable)
 serial_test = { workspace = true, optional = true, default-features = false, features = [
   "logging",
@@ -313,8 +315,7 @@ mlua = { version = "0.10.3", features = [
 ], optional = true }
 
 [target.'cfg(unix)'.dependencies]
-libc = { workspace = true }                # For (*nix) libc
-z3 = { workspace = true, optional = true } # for concolic mutation
+libc = { workspace = true } # For (*nix) libc
 
 [target.'cfg(windows)'.dependencies]
 windows = { workspace = true, features = [

crates/libafl/build.rs

@@ -9,6 +9,9 @@ fn nightly() {
 fn nightly() {}
 
 fn main() {
+    if cfg!(target_os = "windows") {
+        println!("cargo:rustc-link-lib=msvcrt");
+    }
     println!("cargo:rustc-check-cfg=cfg(nightly)");
     println!("cargo:rerun-if-changed=build.rs");
     nightly();

crates/libafl/src/corpus/mod.rs

@@ -30,11 +30,11 @@ pub mod cached;
 #[cfg(feature = "std")]
 pub use cached::CachedOnDiskCorpus;
 
-#[cfg(all(feature = "cmin", unix))]
+#[cfg(feature = "cmin")]
 pub mod minimizer;
 
 pub mod nop;
-#[cfg(all(feature = "cmin", unix))]
+#[cfg(feature = "cmin")]
 pub use minimizer::*;
 pub use nop::NopCorpus;