Skip to content

Commit f495b2e

Browse files
author
Yucong Sun
committed
Fix depenedncy to force libra-swarm use local client implementation.
1 parent 2df09f1 commit f495b2e

File tree

3 files changed

+9
-46
lines changed

3 files changed

+9
-46
lines changed

rust/Cargo.lock

Lines changed: 1 addition & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ serde = { version = "1.0.96", features = ["derive"] }
2525
serde_json = "1.0.40"
2626
structopt = "0.3.2"
2727

28-
# Libra C API, that is all we should need!
29-
libra-dev = { path="../libra-dev" }
28+
# TODO: this actually doesn't work, havn't figure out an way to link against an staticlib dependency yet.
29+
# libra-dev = { path="../libra-dev" }
3030

3131
# All Libra dependencies, The goal is to remove this section down to zero!
3232
# S0: Core types
@@ -58,4 +58,8 @@ compiler = { git = "https://github.com/libra/libra.git", branch = "testnet" }
5858

5959
[features]
6060
default = []
61-
fuzzing = ["proptest", "libra-crypto/fuzzing", "fixme-libra-types/fuzzing"]
61+
fuzzing = ["proptest", "libra-crypto/fuzzing", "fixme-libra-types/fuzzing"]
62+
63+
# Override depenedency to use local client implementation.
64+
[patch."https://github.com/libra/libra.git"]
65+
client = { path = "./" }

rust/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::env;
22
use std::path::PathBuf;
33

44
fn main() {
5-
println!("cargo:rustc-link-lib=libra_dev");
5+
println!("cargo:rustc-link-lib=static=libra_dev");
66
println!("cargo:rustc-link-search=native=../libra-dev/target/debug/");
77

88
// Tell cargo to invalidate the built crate whenever the wrapper changes

0 commit comments

Comments
 (0)