grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rustup' into rustbeta

Browse Source
This commit is contained in:
Gav Wood
2016-02-18 21:09:36 +01:00
parent ae2ef83f16 beb0da4ff4
commit 8e93989eec
10 changed files with 159 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ethcore/Cargo.toml
View File

@@ -11,20 +11,21 @@ log = "0.3"
env_logger = "0.3"
rustc-serialize = "0.3"
rocksdb = "0.3"
heapsize = "0.2.0"
heapsize = { git = "https://github.com/nikvolf/heapsize" }
rust-crypto = "0.2.34"
time = "0.1"
ethcore-util = { path = "../util" }
evmjit = { path = "../evmjit", optional = true }
ethash = { path = "../ethash" }
num_cpus = "0.2"
clippy = { version = "0.0.41", optional = true }
clippy = { version = "0.0.42", optional = true }
crossbeam = "0.1.5"
lazy_static = "0.1"
[features]
jit = ["evmjit"]
evm-debug = []
json-tests = []
json-tests = [ "heapsize/nightly" ]
test-heavy = []
dev = ["clippy"]
default = [ "heapsize/nightly" ]