Skip to content

Commit

Permalink
chore(cli): Remove redundant CLI feature flags
Browse files Browse the repository at this point in the history
The CLI previously had a bunch of feature flags, which were only left in
for legacy support, but which do not change behaviour anymore.

This commit removes the feature flags in question.

(flags: webc_runner, cache, wasi, debug, emscripten, cache-blake3-pure )

Closes #3954
  • Loading branch information
theduke committed Jun 5, 2023
1 parent 6bca649 commit 40c409a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 17 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,10 @@ check-capi:


build-wasmer:
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --release --manifest-path lib/cli/Cargo.toml $(compiler_features) --features="webc_runner" --bin wasmer
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --release --manifest-path lib/cli/Cargo.toml $(compiler_features) --bin wasmer

build-wasmer-jsc:
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --release --manifest-path lib/cli/Cargo.toml --no-default-features --features="jsc,wat,wasi,webc_runner" --bin wasmer
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --release --manifest-path lib/cli/Cargo.toml --no-default-features --features="jsc,wat" --bin wasmer

install-wasi-web:
cd lib/wasi-web && npm install || true
Expand All @@ -409,7 +409,7 @@ build-wasi-web:
cd lib/wasi-web && npm run build

build-wasmer-debug:
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --manifest-path lib/cli/Cargo.toml $(compiler_features) --features "webc_runner,debug" --bin wasmer
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --manifest-path lib/cli/Cargo.toml $(compiler_features) --bin wasmer

bench:
$(CARGO_BINARY) bench $(CARGO_TARGET_FLAG) $(compiler_features)
Expand Down
15 changes: 1 addition & 14 deletions lib/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,9 @@ default = [
"sys",
"wat",
"wast",
"cache",
"wasi",
"emscripten",
"compiler",
"wasmer-artifact-create",
"static-artifact-create",
"webc_runner",
]
backend = []
coredump = [
Expand Down Expand Up @@ -184,7 +180,6 @@ static-artifact-load = ["compiler",
]
experimental-io-devices = [
"wasmer-wasix-experimental-io-devices",
"wasi"
]
singlepass = [
"wasmer-compiler-singlepass",
Expand All @@ -200,7 +195,7 @@ llvm = [
]
disable-all-logging = ["wasmer-wasix/disable-all-logging", "log/release_max_level_off"]
headless = []
headless-minimal = ["headless", "disable-all-logging", "wasi"]
headless-minimal = ["headless", "disable-all-logging"]

# Optional
enable-serde = [
Expand All @@ -210,14 +205,6 @@ enable-serde = [
"wasmer-wasix/enable-serde",
]

# Deprecated. These feature flags no longer protect anything.
cache = []
cache-blake3-pure = []
debug = []
wasi = []
emscripten = []
webc_runner = []

[target.'cfg(target_os = "windows")'.dependencies]
colored = "2.0.0"

Expand Down

0 comments on commit 40c409a

Please sign in to comment.