Skip to content

fix(optee): fix TA compilation on aarch64-linux hosts #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TheButlah wants to merge 1 commit into from
Closed

fix(optee): fix TA compilation on aarch64-linux hosts #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions optee/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
rustflags = "-C panic=abort"
target = "aarch64-unknown-linux-gnu"

[target.aarch64-unknown-linux-gnu]
linker = "aarch64-unknown-linux-gnu-gcc"
# [target.aarch64-unknown-linux-gnu]
# linker = "aarch64-unknown-linux-gnu-gcc"

[unstable]
build-std = ["core", "alloc", "compiler_builtins"]
Expand Down
4 changes: 3 additions & 1 deletion optee/secure-storage/ta/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use optee_utee_build::{Error, RustEdition, TaConfig};

fn main() -> Result<(), Error> {
let config = TaConfig::new_default_with_cargo_env(orb_secure_storage_proto::UUID)?;
let config = TaConfig::new_default_with_cargo_env(
orb_secure_storage_proto::StorageDomain::WifiProfiles.as_uuid(),
)?;
optee_utee_build::build(RustEdition::Edition2024, config)
}
2 changes: 1 addition & 1 deletion xtask/optee/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ impl BuildArgs {
let optee_workspace = optee_workspace
.as_deref()
.unwrap_or_else(|| optee_manifest_dir());
run_cmd!(cd $optee_workspace; RUSTC_BOOTSTRAP=1 cargo build --target aarch64-unknown-linux-gnu --profile $profile -p $package)?;
run_cmd!(cd $optee_workspace; RUSTC_BOOTSTRAP=1 cargo build --profile $profile -p $package)?;

Ok(())
}
Expand Down
Loading