You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by di...@apache.org on 2020/12/02 20:16:16 UTC
[incubator-teaclave-sgx-sdk] 01/01: compile: probe sgx sdk in opt
intel sgxsdk as well
This is an automated email from the ASF dual-hosted git repository.
dingyu pushed a commit to branch yu-probe-sdk
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
commit 4b0fc505046785c3caf4291524b19f08b69f9204
Author: Yu Ding <di...@gmail.com>
AuthorDate: Wed Dec 2 12:15:57 2020 -0800
compile: probe sgx sdk in opt intel sgxsdk as well
---
sgx_backtrace_sys/build.rs | 8 +++++++-
sgx_tstd/build.rs | 7 ++++++-
sgx_ucrypto/build.rs | 7 ++++++-
xargo/sgx_tstd/build.rs | 8 +++++++-
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/sgx_backtrace_sys/build.rs b/sgx_backtrace_sys/build.rs
index 081d9ef..37a4d05 100644
--- a/sgx_backtrace_sys/build.rs
+++ b/sgx_backtrace_sys/build.rs
@@ -19,6 +19,7 @@ use sgx_build_helper as build_helper;
use self::build_helper::native_lib_boilerplate;
use std::env;
use std::fs::File;
+use std::path::Path;
fn main() {
let target = env::var("TARGET").expect("TARGET was not set");
@@ -26,8 +27,13 @@ fn main() {
}
fn build_libbacktrace(_target: &str) -> Result<(), ()> {
- let sdk_dir = env::var("SGX_SDK")
+ let mut sdk_dir = env::var("SGX_SDK")
.unwrap_or_else(|_| "/opt/sgxsdk".to_string());
+
+ if !Path::new(&sdk_dir).exists() {
+ sdk_dir = "/opt/intel/sgxsdk".to_string();
+ }
+
let sdk_include = format!("{}/{}", sdk_dir, "include");
let native = native_lib_boilerplate(
diff --git a/sgx_tstd/build.rs b/sgx_tstd/build.rs
index 1a5488d..e0fd1d9 100644
--- a/sgx_tstd/build.rs
+++ b/sgx_tstd/build.rs
@@ -16,6 +16,7 @@
// under the License..
use std::env;
+use std::path::Path;
use std::process::Command;
fn main() {
@@ -24,11 +25,15 @@ fn main() {
//println!("cargo:rustc-cfg=RUST_BACKTRACE=\"full\"");
}
- let sdk_dir = env::var("SGX_SDK")
+ let mut sdk_dir = env::var("SGX_SDK")
.unwrap_or_else(|_| "/opt/sgxsdk".to_string());
let _is_sim = env::var("SGX_MODE")
.unwrap_or_else(|_| "HW".to_string());
+ if !Path::new(&sdk_dir).exists() {
+ sdk_dir = "/opt/intel/sgxsdk".to_string();
+ }
+
if cfg!(feature = "thread") {
println!("cargo:rustc-link-search=native={}/lib64", sdk_dir);
println!("cargo:rustc-link-lib=static=sgx_pthread");
diff --git a/sgx_ucrypto/build.rs b/sgx_ucrypto/build.rs
index d92de96..0881381 100644
--- a/sgx_ucrypto/build.rs
+++ b/sgx_ucrypto/build.rs
@@ -16,9 +16,14 @@
// under the License..
use std::env;
+use std::path::Path;
fn main() {
- let sdk_dir = env::var("SGX_SDK").unwrap_or_else(|_| "/opt/sgxsdk".to_string());
+ let mut sdk_dir = env::var("SGX_SDK").unwrap_or_else(|_| "/opt/sgxsdk".to_string());
+
+ if !Path::new(&sdk_dir).exists() {
+ sdk_dir = "/opt/intel/sgxsdk".to_string();
+ }
println!("cargo:rustc-link-search=native={}/lib64", sdk_dir);
println!("cargo:rustc-link-lib=static=sgx_tcrypto");
diff --git a/xargo/sgx_tstd/build.rs b/xargo/sgx_tstd/build.rs
index 08a9d10..3b90fc9 100644
--- a/xargo/sgx_tstd/build.rs
+++ b/xargo/sgx_tstd/build.rs
@@ -16,6 +16,7 @@
// under the License..
use std::env;
+use std::path::Path;
fn main() {
if cfg!(feature = "backtrace") {
@@ -23,8 +24,13 @@ fn main() {
//println!("cargo:rustc-cfg=RUST_BACKTRACE=\"full\"");
}
- let sdk_dir = env::var("SGX_SDK")
+ let mut sdk_dir = env::var("SGX_SDK")
.unwrap_or_else(|_| "/opt/sgxsdk".to_string());
+
+ if !Path::new(&sdk_dir).exists() {
+ sdk_dir = "/opt/intel/sgxsdk".to_string();
+ }
+
let _is_sim = env::var("SGX_MODE")
.unwrap_or_else(|_| "HW".to_string());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org