Skip to content

Commit

Permalink
Use local cranelift
Browse files Browse the repository at this point in the history
  • Loading branch information
syrusakbary committed Nov 21, 2018
1 parent 3fa01be commit c141f8b
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 44 deletions.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ jobs:

steps:
- checkout
- run:
name: Pull submodules
command: |
# git pull --recurse-submodules
git submodule sync --recursive
git submodule update --recursive --init
- restore_cache:
keys:
- v4-test-cargo-cache-linux-{{ arch }}-{{ checksum "Cargo.lock" }}
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "cranelift"]
path = cranelift
url = [email protected]:WAFoundation/cranelift.git
55 changes: 20 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ include = [
]

[dependencies]
cranelift-native = "0.23.0"
# cranelift-native = { path = "cranelift/lib/native" }
cranelift-codegen = "0.23.0"
# cranelift-codegen = { path = "cranelift/lib/codegen" }
cranelift-entity = "0.23.0"
# cranelift-entity = { path = "cranelift/lib/entity" }
cranelift-wasm = "0.23.0"
# cranelift-wasm = { path = "cranelift/lib/wasm" }
# cranelift-native = "0.23.0"
cranelift-native = { path = "cranelift/lib/native" }
# cranelift-codegen = "0.23.0"
cranelift-codegen = { path = "cranelift/lib/codegen" }
# cranelift-entity = "0.23.0"
cranelift-entity = { path = "cranelift/lib/entity" }
# cranelift-wasm = "0.23.0"
cranelift-wasm = { path = "cranelift/lib/wasm" }
docopt = "1.0.0"
serde = "1.0.55"
serde_derive = "1.0.55"
Expand All @@ -44,6 +44,8 @@ target-lexicon = "0.2.0"
# libc = "0.2"
libc = { git = "https://github.com/rust-lang/libc" }
nix = "0.11"
backtrace = "0.3.9"
lazy_static = "1.2.0"

[build-dependencies]
wabt = "0.7.1"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ To build this project you will need Rust and Cargo.

```sh
# checkout code and associated submodules
git clone https://github.com/wafoundation/wasmer.git
git clone --recursive https://github.com/wafoundation/wasmer.git
cd wasmer

# install tools
Expand Down
1 change: 1 addition & 0 deletions cranelift
Submodule cranelift added at cb62a1

0 comments on commit c141f8b

Please sign in to comment.