From ef2e180dfd37eb3eae448b205873b10c628efbc2 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 19 Jun 2019 02:06:46 +0100 Subject: [PATCH 1/2] circleci: remove Rust libstd workaround from vmtester --- circle.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/circle.yml b/circle.yml index 429187f..e421c9a 100644 --- a/circle.yml +++ b/circle.yml @@ -176,8 +176,6 @@ jobs: - run: name: Test with evmc-vmtester command: | - # FIXME: there is a linking issue with Cargo workspaces, this is to workaround it - export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib:$LD_LIBRARY_PATH" ~/build/test/evmc-vmtester target/debug/libexamplerustvm.so workflows: From 73951327ba73a549ceeeee13f71b7eeb1cf46f1e Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 19 Jun 2019 02:09:17 +0100 Subject: [PATCH 2/2] rust: compile examples for cdylib and not dylib This avoids the issue of depending on a dynamically linked rust-libstd --- examples/example-rust-vm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example-rust-vm/Cargo.toml b/examples/example-rust-vm/Cargo.toml index 0e35029..abcf8c4 100644 --- a/examples/example-rust-vm/Cargo.toml +++ b/examples/example-rust-vm/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [lib] name = "examplerustvm" -crate-type = ["staticlib", "dylib"] +crate-type = ["staticlib", "cdylib"] [dependencies] evmc-sys = { path = "../../bindings/rust/evmc-sys" }