Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve default compiler story for wasmer cli #1033

Merged
merged 5 commits into from
Dec 6, 2019
Merged

Improve default compiler story for wasmer cli #1033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab11144
Improve default compiler story for wasmer cli
Dec 2, 2019
e32a1a6
Update from feedback; add changelog entry
Dec 6, 2019
d237bda
Merge branch 'master' into fix/default-compiler-wasmer-cli
MarkMcCaskey Dec 6, 2019
448faaf
Apply cargo fmt after GitHub merge
Dec 6, 2019
0580a11
Improve compile error message when no backends set
MarkMcCaskey Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ serde = { version = "1", features = ["derive"] } # used by the plugin example
typetag = "0.1" # used by the plugin example

[features]
default = ["fast-tests", "wasi"]
default = ["fast-tests", "wasi", "backend-cranelift"]
"loader-kernel" = ["wasmer-kernel-loader"]
debug = ["wasmer-runtime-core/debug"]
trace = ["wasmer-runtime-core/trace"]
Expand Down
14 changes: 13 additions & 1 deletion src/bin/wasmer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ use wasmer_runtime_core::{
#[cfg(feature = "wasi")]
use wasmer_wasi;

#[cfg(all(
not(feature = "backend-cranelift"),
not(feature = "backend-llvm"),
not(feature = "backend-singlepass")
))]
MarkMcCaskey marked this conversation as resolved.
Show resolved Hide resolved
compile_error!("Please enable at least one of the compiler backends");
MarkMcCaskey marked this conversation as resolved.
Show resolved Hide resolved

#[derive(Debug, StructOpt)]
#[structopt(name = "wasmer", about = "Wasm execution runtime.", author)]
/// The options for the wasmer Command Line Interface
Expand Down Expand Up @@ -560,7 +567,12 @@ fn execute_wasm(options: &Run) -> Result<(), String> {

let compiler: Box<dyn Compiler> = match get_compiler_by_backend(options.backend, options) {
Some(x) => x,
None => return Err("the requested backend is not enabled".into()),
None => {
return Err(format!(
"the requested backend, \"{}\", is not enabled",
options.backend.to_string()
))
}
};

#[cfg(feature = "backend-llvm")]
Expand Down