build: update MSRV to nightly-2025-12-11#285
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
| { | ||
| "arch": "aarch64", | ||
| "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", | ||
| "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32", |
There was a problem hiding this comment.
There are duplicate files in the cargo-optee directory. Should these be updated as well, or would it be better to remove them entirely?
There was a problem hiding this comment.
The modification of cargo-optee is planned in the follow-up PRs, after this PR merged I will remove the Xargo and update our building system. To reduce the effort of multiple modifications I plan to adjust the cargo-optee after that.
For this PR, I suggest we omit the CI errors of cargo-optee and std-dev-docker.
| ifeq ($(BUILDER),xargo) | ||
| EXTRA_FLAGS = | ||
| else | ||
| EXTRA_FLAGS = -Z build-std=core,alloc -Z build-std-features=panic_immediate_abort |
There was a problem hiding this comment.
cargo-optee adds the build-std flag by default; I think we should remove that as well.
teaclave-trustzone-sdk/cargo-optee/src/ta_builder.rs
Lines 362 to 368 in 925a5d4
Fix errors introduced by new clippy version: - empty_line_after_doc_comments - manual_div_ceil - mismatched_lifetime_syntaxes - doc_lazy_continuation - doc_overindented_list_items
|
Reorganized the commits, will merge this PR later if there're no follow-up comments today, thanks! |
Changes:
setup_std_dependencies.shto clone the pinned Rust source and apply patches from teaclave-crates trustzone-sdk: add ported std and libc for OP-TEE std TAs teaclave-crates#10. After that PR merged the clone source should be updated insetup_std_dependencies.sh.XARGO_RUST_SRCpointing to the newlibrary/workspace.Status:
std-for-dev-dockerandcargo-optee-*for this PR. Since the build toolchain will be overhauled in the next step, these environments will be updated accordingly at that time.Next Steps:
cargo -Z build-stdas the primary build tool, as Xargo is outdated and no longer updated.