[incubator-teaclave] 01/03: Fix SDK building issue on macos

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git

commit 7956ff38201d6010a6bfb4c1b80273877e65e8bf
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Mon Feb 1 13:57:16 2021 -0800

    Fix SDK building issue on macos
---
 common/protected_fs_rs/build.rs                | 2 +-
 common/protected_fs_rs/protected_fs_c/build.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/protected_fs_rs/build.rs b/common/protected_fs_rs/build.rs
index c391f2d..0520c8a 100644
--- a/common/protected_fs_rs/build.rs
+++ b/common/protected_fs_rs/build.rs
@@ -55,7 +55,7 @@ fn build_non_sgx_protected_fs_c_with_cmake() {
     println!("cargo:rustc-link-search=native={}", target_dir.display());
     println!("cargo:rustc-link-lib=static=tprotected_fs");
     println!("cargo:rustc-link-lib=static=uprotected_fs");
-    if target != "aarch64-apple-ios" {
+    if target != "aarch64-apple-ios" && target != "x86_64-apple-darwin" {
         println!("cargo:rustc-link-lib=crypto");
         println!("cargo:rustc-link-lib=stdc++");
     }
diff --git a/common/protected_fs_rs/protected_fs_c/build.sh b/common/protected_fs_rs/protected_fs_c/build.sh
index 2b3a698..ffb0a68 100644
--- a/common/protected_fs_rs/protected_fs_c/build.sh
+++ b/common/protected_fs_rs/protected_fs_c/build.sh
@@ -56,4 +56,4 @@ cd "${BUILD_DIR}"
 cmake ${TARGET_FLAGS} ${MODE} ${BUILD_TYPE} "${SOURCE_DIR}"
 
 # We need to force build with -j1 here.
-cmake --build . ${BUILD_TYPE} -- -j1
+MAKEFLAGS=-j1 cmake --build . ${BUILD_TYPE}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org