From 9e51c39144875e0c6a2848bb2896b2a05d4bffdb Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Sat, 3 Aug 2019 11:54:59 +0300 Subject: [PATCH 1/9] Cargo.toml - configuring `singlepass` feature --- lib/runtime-c-api/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index d4447740b8e..85a5d6ae68a 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -23,8 +23,10 @@ path = "../runtime-core" version = "0.6.0" [features] +default = [] debug = ["wasmer-runtime/debug"] llvm = ["wasmer-runtime/llvm"] +singlepass = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] [build-dependencies] cbindgen = "0.9.0" From a06fa40faa6cf4b75cfe8e6d0e2e01d403a63326 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Sat, 3 Aug 2019 22:03:21 +0300 Subject: [PATCH 2/9] runtime-c-api: adding feature `default-backend-singlepass` to Cargo.toml --- lib/runtime-c-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 85a5d6ae68a..6578f023671 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -26,7 +26,7 @@ version = "0.6.0" default = [] debug = ["wasmer-runtime/debug"] llvm = ["wasmer-runtime/llvm"] -singlepass = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] +default-backend-singlepass = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] [build-dependencies] cbindgen = "0.9.0" From 8d583ad4d4ec316fa6d89b9a4aaac936af0e26f0 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Sat, 3 Aug 2019 22:47:36 +0300 Subject: [PATCH 3/9] runtime-c-api: Cargo.toml - adding `default-features=false` for `wasmer-runtime` and `wasmer-runtime-core` dependencies --- lib/runtime-c-api/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 6578f023671..7ba55e06b9f 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -15,10 +15,12 @@ crate-type = ["cdylib", "rlib", "staticlib"] libc = "0.2.60" [dependencies.wasmer-runtime] +default-features = false path = "../runtime" version = "0.6.0" [dependencies.wasmer-runtime-core] +default-features = false path = "../runtime-core" version = "0.6.0" From 0b84d9b5afe19e41fdf5bdea9ae3e01b7ac103f0 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 22 Aug 2019 13:24:25 +0300 Subject: [PATCH 4/9] Cargo.toml - installing `cranelif` by default. --- lib/runtime-c-api/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 7ba55e06b9f..0707ed63dd0 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -25,8 +25,9 @@ path = "../runtime-core" version = "0.6.0" [features] -default = [] +default = ["clif"] debug = ["wasmer-runtime/debug"] +clif = ["wasmer-runtime/cranelift", "wasmer-runtime/default-backend-cranelift"] llvm = ["wasmer-runtime/llvm"] default-backend-singlepass = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] From 2c3e5f06d0e65a40b6565deffbb89ebd32d1b85c Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 22 Aug 2019 14:23:13 +0300 Subject: [PATCH 5/9] Cargo.toml - renaming feature `default-backend-singlepass` to `singlepass`. --- lib/runtime-c-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 0707ed63dd0..182154f9fc2 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -29,7 +29,7 @@ default = ["clif"] debug = ["wasmer-runtime/debug"] clif = ["wasmer-runtime/cranelift", "wasmer-runtime/default-backend-cranelift"] llvm = ["wasmer-runtime/llvm"] -default-backend-singlepass = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] +singlepass = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] [build-dependencies] cbindgen = "0.9.0" From 0d888824cd704bdd90f5c52d843a481c2cb4000e Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 22 Aug 2019 14:36:12 +0300 Subject: [PATCH 6/9] Cargo.toml - renaming features --- lib/runtime-c-api/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 182154f9fc2..8d2e5f95a05 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -25,11 +25,11 @@ path = "../runtime-core" version = "0.6.0" [features] -default = ["clif"] +default = ["cranelift-backend"] debug = ["wasmer-runtime/debug"] -clif = ["wasmer-runtime/cranelift", "wasmer-runtime/default-backend-cranelift"] -llvm = ["wasmer-runtime/llvm"] -singlepass = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] +cranelift-backend = ["wasmer-runtime/cranelift", "wasmer-runtime/default-backend-cranelift"] +llvm-backend = ["wasmer-runtime/llvm"] +singlepass-backend = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] [build-dependencies] cbindgen = "0.9.0" From 4fcf61f3a0cbd9dc907500d76575c22b3c37a4d1 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 22 Aug 2019 15:52:23 +0300 Subject: [PATCH 7/9] Cargo.toml - fix --- lib/runtime-c-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 8d2e5f95a05..e563809626d 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -29,7 +29,7 @@ default = ["cranelift-backend"] debug = ["wasmer-runtime/debug"] cranelift-backend = ["wasmer-runtime/cranelift", "wasmer-runtime/default-backend-cranelift"] llvm-backend = ["wasmer-runtime/llvm"] -singlepass-backend = ["wasmer-runtime/default-backend-singlepass", "wasmer-runtime-core/backend-singlepass"] +singlepass-backend = ["wasmer-runtime/singlepass"] [build-dependencies] cbindgen = "0.9.0" From dd705d8031fb15f65d928b67896faeac17fbc172 Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 22 Aug 2019 16:36:01 +0300 Subject: [PATCH 8/9] Cargo.toml - building `singlepass-backend` without default features works --- lib/runtime-c-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index e563809626d..2d7ab58ab3a 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -29,7 +29,7 @@ default = ["cranelift-backend"] debug = ["wasmer-runtime/debug"] cranelift-backend = ["wasmer-runtime/cranelift", "wasmer-runtime/default-backend-cranelift"] llvm-backend = ["wasmer-runtime/llvm"] -singlepass-backend = ["wasmer-runtime/singlepass"] +singlepass-backend = ["wasmer-runtime/singlepass", "wasmer-runtime/default-backend-singlepass"] [build-dependencies] cbindgen = "0.9.0" From 86a3a75fe70e8f6e7b2dfe7b082ce72798bba73c Mon Sep 17 00:00:00 2001 From: Yaron Wittenstein Date: Thu, 22 Aug 2019 17:21:13 +0300 Subject: [PATCH 9/9] adding to `llvm-backend` feature: "wasmer-runtime/default-backend-llvm" --- lib/runtime-c-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml index 2d7ab58ab3a..c95442c625a 100644 --- a/lib/runtime-c-api/Cargo.toml +++ b/lib/runtime-c-api/Cargo.toml @@ -28,7 +28,7 @@ version = "0.6.0" default = ["cranelift-backend"] debug = ["wasmer-runtime/debug"] cranelift-backend = ["wasmer-runtime/cranelift", "wasmer-runtime/default-backend-cranelift"] -llvm-backend = ["wasmer-runtime/llvm"] +llvm-backend = ["wasmer-runtime/llvm", "wasmer-runtime/default-backend-llvm"] singlepass-backend = ["wasmer-runtime/singlepass", "wasmer-runtime/default-backend-singlepass"] [build-dependencies]