diff --git a/rust/libceed-sys/Cargo.toml b/rust/libceed-sys/Cargo.toml index 18f514a52a..38f905a295 100644 --- a/rust/libceed-sys/Cargo.toml +++ b/rust/libceed-sys/Cargo.toml @@ -25,8 +25,7 @@ include = [ ] [features] -default = ["static"] -static = [] +shared = [] system = [] [build-dependencies] diff --git a/rust/libceed-sys/build.rs b/rust/libceed-sys/build.rs index d1cc93be6e..b165c9b504 100644 --- a/rust/libceed-sys/build.rs +++ b/rust/libceed-sys/build.rs @@ -6,7 +6,7 @@ use std::process::Command; fn main() { let out_dir = PathBuf::from(env("OUT_DIR").unwrap()); - let statik = env("CARGO_FEATURE_STATIC").is_some(); + let shared = env("CARGO_FEATURE_SHARED").is_some(); let system = env("CARGO_FEATURE_SYSTEM").is_some(); let ceed_pc = if system { @@ -28,7 +28,7 @@ fn main() { .arg("FC=") // Don't try to find Fortran (unused library build/install) .env("MAKEFLAGS", makeflags) .current_dir("c-src"); - if statik { + if !shared { make.arg("STATIC=1"); } run(&mut make); @@ -40,7 +40,7 @@ fn main() { .into_owned() }; pkg_config::Config::new() - .statik(statik) + .statik(!shared) .atleast_version("0.12.0") .probe(&ceed_pc) .unwrap(); diff --git a/rust/libceed/Cargo.toml b/rust/libceed/Cargo.toml index 42dce37e2d..ec827fe3cf 100644 --- a/rust/libceed/Cargo.toml +++ b/rust/libceed/Cargo.toml @@ -18,12 +18,16 @@ keywords = ["libceed", "exascale", "high-order"] categories = ["science"] [dependencies] -libceed-sys = { version = "0.12", path = "../libceed-sys" } +libceed-sys = { version = "0.12", path = "../libceed-sys", default-features = false} katexit = { version = "0.1.1", optional = true } [dev-dependencies] version-sync = "0.9.2" +[features] +shared = ["libceed-sys/shared"] +system = ["libceed-sys/system"] + [package.metadata.docs.rs] features = ["katexit"]