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


The following commit(s) were added to refs/heads/master by this push:
     new 05769c8  Fix building issue when source is not in the git repo (#422)
05769c8 is described below

commit 05769c80fd15612003d629603cadd2ecddbfca46
Author: Mingshen Sun <[email protected]>
AuthorDate: Tue Sep 29 16:15:02 2020 -0700

    Fix building issue when source is not in the git repo (#422)
---
 cmake/scripts/prep.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmake/scripts/prep.sh b/cmake/scripts/prep.sh
index 20f6199..3a3b11b 100755
--- a/cmake/scripts/prep.sh
+++ b/cmake/scripts/prep.sh
@@ -57,8 +57,7 @@ ln -snf ${HOME}/.cargo ${TEACLAVE_SYMLINKS}/cargo_home
 ln -snf ${CMAKE_SOURCE_DIR} ${TEACLAVE_SYMLINKS}/teaclave_src
 ln -snf ${CMAKE_BINARY_DIR} ${TEACLAVE_SYMLINKS}/teaclave_build
 # cleanup sgx_unwind/libunwind
-(cd ${CMAKE_SOURCE_DIR}/third_party/crates-sgx/ && git clean -fdx 
vendor/sgx_unwind/libunwind/)
-if git submodule status | egrep -q '^[-]|^[+]'; then echo 'INFO: Need to 
reinitialize git submodules' && git submodule update --init --recursive; fi
+(cd ${CMAKE_SOURCE_DIR}/third_party/crates-sgx/ && if [ -d .git ]; then git 
clean -fdx vendor/sgx_unwind/libunwind/; fi)
 rustup install --no-self-update ${RUSTUP_TOOLCHAIN} > /dev/null 2>&1
 
 # build edl_libs


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to