Skip to content

Commit

Permalink
Merge pull request #1255 from fitzgen/configure-walrus
Browse files Browse the repository at this point in the history
Configure walrus to generate DWARF/names at the right times
  • Loading branch information
alexcrichton authored Feb 14, 2019
2 parents c49b87b + 17dc79e commit 7c7acf2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion crates/cli-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ base64 = "0.9"
failure = "0.1.2"
rustc-demangle = "0.1.13"
tempfile = "3.0"
walrus = "0.1"
walrus = "0.2"
wasm-bindgen-shared = { path = "../shared", version = '=0.2.36' }
wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.36' }
wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.36' }
2 changes: 2 additions & 0 deletions crates/cli-support/src/lib.rs
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ impl Bindgen {
// include shared memory, so it fails that part of
// validation!
.strict_validate(false)
.generate_dwarf(self.keep_debug)
.generate_name_section(!self.remove_name_section)
.parse(&contents)
.context("failed to parse input file as wasm")?;
let stem = match &self.out_name {
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rouille = { version = "3.0.0", default-features = false }
serde = { version = "1.0", features = ['derive'] }
serde_derive = "1.0"
serde_json = "1.0"
walrus = "0.1"
walrus = "0.2"
wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.36" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.36" }

Expand Down
2 changes: 1 addition & 1 deletion crates/threads-xform/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ Support for threading-related transformations in wasm-bindgen
edition = "2018"

[dependencies]
walrus = "0.1"
walrus = "0.2"
failure = "0.1"
2 changes: 1 addition & 1 deletion crates/wasm-interpreter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Micro-interpreter optimized for wasm-bindgen's use case
edition = '2018'

[dependencies]
walrus = "0.1"
walrus = "0.2"
log = "0.4"

[dev-dependencies]
Expand Down

0 comments on commit 7c7acf2

Please sign in to comment.