Address review

Author: aumetra

packages/vm/Cargo.toml

@@ -18,10 +18,7 @@ iterator = ["cosmwasm-std/iterator"]
 staking = ["cosmwasm-std/staking"]
 # this enables all stargate-related functionality, including the ibc entry points
 stargate = ["cosmwasm-std/stargate"]
-# Use cranelift backend instead of singlepass. This is required for development on Windows.
-#
-# Note: This feature is automatically enabled on Windows, you don't have to toggle it manually anymore.
-# This is just to be able to debug issues with Cranelift on non-Windows platforms.
+# Use cranelift backend instead of singlepass
 cranelift = ["wasmer/cranelift"]
 # For heap profiling. Only used in the "heap_profiling" example.
 dhat-heap = ["dep:dhat"]
@@ -62,9 +59,6 @@ tracing = "0.1.32"
 # wasmer = { path = "../../../wasmer/lib/api", default-features = false, features = ["cranelift", "singlepass"] }
 # wasmer-middlewares = { path = "../../../wasmer/lib/middlewares" }
 
-[target.'cfg(target_family = "windows")'.dependencies]
-wasmer = { version = "=4.2.6", default-features = false, features = ["cranelift"] }
-
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["html_reports"] }
 glob = "0.3.1"

packages/vm/src/wasm_backend/engine.rs

@@ -26,11 +26,11 @@ fn cost(_operator: &Operator) -> u64 {
     150
 }
 
-/// Creates the appropriate compiler config for the platform
+/// Use Cranelift as the compiler backend if the feature is enabled
 pub fn make_compiler_config() -> impl CompilerConfig + Into<Engine> {
-    #[cfg(any(feature = "cranelift", target_family = "windows"))]
+    #[cfg(feature = "cranelift")]
     return wasmer::Cranelift::new();
-    #[cfg(not(any(feature = "cranelift", target_family = "windows")))]
+    #[cfg(not(feature = "cranelift"))]
     wasmer::Singlepass::new()
 }