From c1fd8d38f227d97dabdc8528d1fe50b711f5f3ad Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Mon, 31 Jul 2023 13:05:31 -0500 Subject: [PATCH] Only enable core features for legacy build --- build.rs | 4 ++++ build.sh | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.rs b/build.rs index 3ab07b40e..6b3a6306b 100644 --- a/build.rs +++ b/build.rs @@ -67,11 +67,15 @@ fn main() { let shell = std::env::var("SHELL").unwrap_or("/bin/bash".to_string()); println!("Using shell: {}", shell); + + let cargo_features = std::env::var("NOMIC_LEGACY_FEATURES").unwrap_or("full,feat-ibc,testnet".to_string()); + let res = std::process::Command::new(shell) .env_clear() .env("OUT_DIR", std::env::var("OUT_DIR").unwrap()) .env("PATH", std::env::var("PATH").unwrap()) .env("NOMIC_LEGACY_REV", rev) + .env("CARGO_FEATURES", cargo_features) .args(["build.sh"]) .spawn() .unwrap() diff --git a/build.sh b/build.sh index 6a5751a9c..d1a505962 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ BUILD_DIR=$OUT_DIR/nomic NOMIC_LEGACY_PATH=$OUT_DIR/nomic-$NOMIC_LEGACY_REV if [ ! -f "$NOMIC_LEGACY_PATH" ]; then - echo "Building legacy nomic at $BUILD_DIR..." + echo "Building legacy nomic at $NOMIC_LEGACY_PATH..." if [ ! -d "$BUILD_DIR" ]; then git clone https://github.com/nomic-io/nomic.git $BUILD_DIR fi @@ -17,8 +17,9 @@ if [ ! -f "$NOMIC_LEGACY_PATH" ]; then git checkout $NOMIC_LEGACY_REV rustc --version - cargo build --release - mv $BUILD_DIR/target/release/nomic $NOMIC_LEGACY_PATH + echo "Building with features: $CARGO_FEATURES" + cargo build --release --no-default-features --features $CARGO_FEATURES + cp $BUILD_DIR/target/release/nomic $NOMIC_LEGACY_PATH else echo "Skipping legacy nomic binary build (already exists at $NOMIC_LEGACY_PATH)" fi