From 8183474d109c9fc3c358fa146477e038abe9e3e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= <felix@wasmer.io>
Date: Tue, 17 Jan 2023 21:38:25 +0100
Subject: [PATCH] Adjust feature flags

---
 Cargo.toml                                  | 8 ++++----
 lib/c-api/Cargo.toml                        | 6 ++++++
 lib/cli/Cargo.toml                          | 2 +-
 lib/wasi-experimental-io-devices/Cargo.toml | 2 +-
 tests/lib/wast/Cargo.toml                   | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 25dbdf20a83..ef50a99fad6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,16 +100,16 @@ engine = ["universal"]
 universal = []
 cache = ["wasmer-cache"]
 wast = ["wasmer-wast"]
-wasi = ["wasmer-wasi"]
+wasi = ["wasmer-wasi", "wasmer-wasi/emscripten_cranelift", "wasmer-wasi/wasi_cranelift"]
 emscripten = ["wasmer-emscripten"]
 wat = ["wasmer/wat"]
 compiler = [
     "wasmer/compiler",
     "wasmer-compiler/translator",
 ]
-singlepass = ["wasmer-compiler-singlepass", "compiler"]
-cranelift = ["wasmer-compiler-cranelift", "compiler"]
-llvm = ["wasmer-compiler-llvm", "compiler"]
+singlepass = ["wasmer-compiler-singlepass", "compiler", "wasmer-wasi/emscripten_singlepass", "wasmer-wasi/wasi_singlepass"]
+cranelift = ["wasmer-compiler-cranelift", "compiler", "wasmer-wasi/emscripten_cranelift", "wasmer-wasi/wasi_cranelift"]
+llvm = ["wasmer-compiler-llvm", "compiler", "wasmer-wasi/emscripten_llvm", "wasmer-wasi/wasi_llvm"]
 middlewares = ["wasmer-middlewares"]
 wasmer-artifact-load = ["wasmer-compiler/wasmer-artifact-load"]
 wasmer-artifact-create = ["wasmer-compiler/wasmer-artifact-create"]
diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
index 6f5190fa317..a10090903b5 100644
--- a/lib/c-api/Cargo.toml
+++ b/lib/c-api/Cargo.toml
@@ -78,14 +78,20 @@ compiler-headless = [
 ]
 singlepass = [
     "wasmer-compiler-singlepass",
+    "wasmer-wasi/emscripten_singlepass", 
+    "wasmer-wasi/wasi_singlepass",
     "compiler",
 ]
 cranelift = [
     "wasmer-compiler-cranelift",
+    "wasmer-wasi/emscripten_cranelift", 
+    "wasmer-wasi/wasi_cranelift",
     "compiler",
 ]
 llvm = [
     "wasmer-compiler-llvm",
+    "wasmer-wasi/emscripten_llvm", 
+    "wasmer-wasi/wasi_llvm",
     "compiler",
 ]
 wasmer-artifact-load = ["wasmer-compiler/wasmer-artifact-load"]
diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
index a1960afa947..6be7a2f305e 100644
--- a/lib/cli/Cargo.toml
+++ b/lib/cli/Cargo.toml
@@ -32,7 +32,7 @@ wasmer-compiler-singlepass = { version = "=3.1.0", path = "../compiler-singlepas
 wasmer-compiler-llvm = { version = "=3.1.0", path = "../compiler-llvm", optional = true }
 wasmer-emscripten = { version = "=3.1.0", path = "../emscripten", optional = true }
 wasmer-vm = { version = "=3.1.0", path = "../vm" }
-wasmer-wasi = { version = "=3.1.0", path = "../wasi", optional = true }
+wasmer-wasi = { version = "=3.1.0", path = "../wasi", features = ["emscripten_cranelift", "wasi_cranelift"], optional = true }
 wasmer-wasi-experimental-io-devices = { version = "=3.1.0", path = "../wasi-experimental-io-devices", optional = true, features = ["link_external_libs"] }
 wasmer-wast = { version = "=3.1.0", path = "../../tests/lib/wast", optional = true }
 wasmer-cache = { version = "=3.1.0", path = "../cache", optional = true }
diff --git a/lib/wasi-experimental-io-devices/Cargo.toml b/lib/wasi-experimental-io-devices/Cargo.toml
index 2d867fe0f22..30f91dfd45f 100644
--- a/lib/wasi-experimental-io-devices/Cargo.toml
+++ b/lib/wasi-experimental-io-devices/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 maintenance = { status = "experimental" }
 
 [dependencies]
-wasmer-wasi = { version = "=3.1.0", path = "../wasi", default-features=false }
+wasmer-wasi = { version = "=3.1.0", path = "../wasi", default-features=false, features = ["emscripten_cranelift", "wasi_cranelift"] }
 tracing = "0.1"
 minifb = { version = "0.23", optional = true }
 nix = "0.25.0"
diff --git a/tests/lib/wast/Cargo.toml b/tests/lib/wast/Cargo.toml
index 4d9507ae097..5ed6c8a7242 100644
--- a/tests/lib/wast/Cargo.toml
+++ b/tests/lib/wast/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 wasmer = { path = "../../../lib/api", version = "=3.1.0", default-features = false }
-wasmer-wasi = { path = "../../../lib/wasi", version = "=3.1.0" }
+wasmer-wasi = { path = "../../../lib/wasi", version = "=3.1.0", features = ["emscripten_cranelift", "wasi_cranelift"] }
 wasmer-vfs = { path = "../../../lib/vfs", version = "=3.1.0" }
 wast = "38.0"
 serde = "1"