From 812b7c4d8ebf7d2e93745406d5310df4a12ccb3b Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 19 Jul 2019 10:02:07 -0700 Subject: [PATCH 1/2] Fix compilation of wasmtime-environ from within wasmtime-jit. Enable wasmtime-environ/std when wasmtime-jit's std feature is enabled. Fixes #200. --- wasmtime-jit/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasmtime-jit/Cargo.toml b/wasmtime-jit/Cargo.toml index 60b9fbec3693..b1c5712e2841 100644 --- a/wasmtime-jit/Cargo.toml +++ b/wasmtime-jit/Cargo.toml @@ -28,7 +28,7 @@ wasmparser = "0.32.1" [features] default = ["std"] -std = ["cranelift-codegen/std", "cranelift-wasm/std"] +std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std"] core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core"] lightbeam = ["wasmtime-environ/lightbeam"] From 7b62d84d75570f33069525598de983a650ad30e9 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 19 Jul 2019 10:25:35 -0700 Subject: [PATCH 2/2] Fix wasmtime-debug build too. --- wasmtime-debug/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasmtime-debug/Cargo.toml b/wasmtime-debug/Cargo.toml index a5521c8e94c3..c3f696729d00 100644 --- a/wasmtime-debug/Cargo.toml +++ b/wasmtime-debug/Cargo.toml @@ -25,7 +25,7 @@ failure_derive = { version = "0.1.3", default-features = false } [features] default = ["std"] -std = ["cranelift-codegen/std", "cranelift-wasm/std"] +std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std"] core = ["cranelift-codegen/core", "cranelift-wasm/core"] [badges]