This is an automated email from the ASF dual-hosted git repository. yuanz pushed a commit to branch no-std in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit d31decd4e042eec744f1474de64385026e8b66ac Author: Sumit Garg <[email protected]> AuthorDate: Fri Dec 29 18:33:12 2023 +0530 optee-teec: Use standard OPTEE_CLIENT_EXPORT Similar to C counterparts, use OPTEE_CLIENT_EXPORT as a standard path to export pre-built optee-client libraries and headers. Signed-off-by: Sumit Garg <[email protected]> --- optee-teec/optee-teec-sys/build.rs | 4 ++-- optee-teec/systest/build.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/optee-teec/optee-teec-sys/build.rs b/optee-teec/optee-teec-sys/build.rs index 2d8fc42..e8da2e2 100644 --- a/optee-teec/optee-teec-sys/build.rs +++ b/optee-teec/optee-teec-sys/build.rs @@ -19,8 +19,8 @@ use std::env; use std::path::Path; fn main() { - let optee_client_dir = env::var("OPTEE_CLIENT_DIR").unwrap_or("../../optee/optee_client/out".to_string()); - let search_path = Path::new(&optee_client_dir).join("libteec"); + let optee_client_dir = env::var("OPTEE_CLIENT_EXPORT").unwrap_or("../optee_client/out/export".to_string()); + let search_path = Path::new(&optee_client_dir).join("usr/lib"); println!("cargo:rustc-link-search={}", search_path.display()); println!("cargo:rustc-link-lib=dylib=teec"); } diff --git a/optee-teec/systest/build.rs b/optee-teec/systest/build.rs index 2108675..e2a76ce 100644 --- a/optee-teec/systest/build.rs +++ b/optee-teec/systest/build.rs @@ -21,7 +21,7 @@ fn main() { let mut cfg = ctest::TestGenerator::new(); cfg.target("aarch64-unknown-linux-gnu") .header("tee_client_api.h") - .include(env::var("OPTEE_CLIENT_INCLUDE").unwrap()) + .include(env::var("OPTEE_CLIENT_EXPORT").unwrap()) .type_name(|s, _is_struct, _is_union| { s.to_string() }); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
