This is an automated email from the ASF dual-hosted git repository. zfc pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit 38518dee492b9c6c93d834b44b18f84ad32f0e81 Author: Zhaofeng Chen <[email protected]> AuthorDate: Tue Aug 12 01:12:47 2025 +0000 setup: xargo install using default cargo --- .gitignore | 2 ++ scripts/setup-std/setup_rust_std.sh | 2 +- setup_std_dependencies.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6affd74..1e96716 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ target/ /out Cargo.lock +rust/ + # Allow tracking Cargo.lock in std examples !examples/message_passing_interface-rs/ta/Cargo.lock !examples/secure_db_abstraction-rs/ta/Cargo.lock diff --git a/scripts/setup-std/setup_rust_std.sh b/scripts/setup-std/setup_rust_std.sh index 5f5c158..93f7795 100755 --- a/scripts/setup-std/setup_rust_std.sh +++ b/scripts/setup-std/setup_rust_std.sh @@ -32,7 +32,7 @@ mkdir -p $RUST_STD_DIR cd $RUST_STD_DIR # install Xargo if not exist -which xargo || cargo +stable install xargo +which xargo || cargo install xargo # initialize submodules: rust / libc with pinned versions for reproducible builds RUST_BRANCH=optee-xargo diff --git a/setup_std_dependencies.sh b/setup_std_dependencies.sh index ff2e210..adc3537 100755 --- a/setup_std_dependencies.sh +++ b/setup_std_dependencies.sh @@ -25,7 +25,7 @@ cd "$(dirname "$0")" ########################################## # install Xargo if not exist -which xargo || cargo +stable install xargo +which xargo || cargo install xargo ########################################## # initialize submodules: rust / libc --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
