From fb78c606e4e03aa374e374d2c0b5e3732a78f34d Mon Sep 17 00:00:00 2001 From: Piet Geursen Date: Thu, 14 Jan 2021 22:29:00 +1300 Subject: [PATCH] Or maybe this --- Cargo.toml | 9 --------- bamboo-c/Cargo.toml | 4 ++++ ci/build.bash | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8a8523adf..5f3acb593 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,15 +9,6 @@ members = [ "bamboo-rs-wasm" ] - -default-members = [ - "bamboo-rs-core", - "bamboo-rs-core-test", - "bamboo-rs-cli", - "generate-test-vectors", - "bamboo-rs-wasm" -] - exclude = [ "bamboo-rs-log" ] diff --git a/bamboo-c/Cargo.toml b/bamboo-c/Cargo.toml index 285a9e6e6..7a1896157 100644 --- a/bamboo-c/Cargo.toml +++ b/bamboo-c/Cargo.toml @@ -8,6 +8,10 @@ edition = "2018" name = "bamboo_c" crate-type = ["cdylib", "staticlib"] +[features] +default = ["std"] +std = ["ed25519-dalek/std"] + [dependencies] bamboo-rs-core = {path = "../bamboo-rs-core", default_features = false} ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_backend"] } diff --git a/ci/build.bash b/ci/build.bash index c97c9e60c..d6ff8a958 100755 --- a/ci/build.bash +++ b/ci/build.bash @@ -22,14 +22,14 @@ if [ -z "$RELEASE_BUILD" ]; then $CROSS build --target $TARGET_TRIPLE $CROSS build --target $TARGET_TRIPLE --all-features else - $CROSS build -p bamboo-c --target $TARGET_TRIPLE + $CROSS build -p bamboo-c --target $TARGET_TRIPLE --no-default-features --manifest-path=bamboo-c/Cargo.toml fi else if [ -z $NO_STD ] then $CROSS build --target $TARGET_TRIPLE --all-features --release else - $CROSS build -p bamboo-c --target $TARGET_TRIPLE --release + $CROSS build -p bamboo-c --target $TARGET_TRIPLE --no-default-features --manifest-path=bamboo-c/Cargo.toml --release fi fi