Skip to content
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.

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

add build dependence path for td migration build #130

Merged
merged 2 commits into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Linux/sgx/libsgx_tsgxssl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ else
SGX_EDGER8R := $(BUILD_DIR)/sgx_edger8r
SGX_SDK_INC := $(COMMON_DIR)/inc
LIBCXX_INC := $(LINUX_SDK_DIR)/tlibcxx/include
else ifeq ($(LINUX_SGX_BUILD), 2)
include ../../../../../QuoteGeneration/buildenv.mk
SGX_EDGER8R := $(TD_MIGRATION_STD_LIB_PATH)/sgx_edger8r
SGX_SDK_INC := $(TD_MIGRATION_STD_INC_PATH)
LIBCXX_INC := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include
else
SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
SGX_SDK_INC := $(SGX_SDK)/include
Expand Down
5 changes: 5 additions & 0 deletions Linux/sgx/libsgx_usgxssl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ else
include ../../../../../buildenv.mk
SGX_EDGER8R := $(BUILD_DIR)/sgx_edger8r
SGX_SDK_INC := $(COMMON_DIR)/inc
else ifeq ($(LINUX_SGX_BUILD), 2)
include ../../../../../QuoteGeneration/buildenv.mk
SGX_EDGER8R := $(TD_MIGRATION_STD_LIB_PATH)/sgx_edger8r
SGX_SDK_INC := $(TD_MIGRATION_STD_INC_PATH)
LIBCXX_INC := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include
else
SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
SGX_SDK_INC := $(SGX_SDK)/include
Expand Down
5 changes: 5 additions & 0 deletions Linux/sgx/test_app/sgx_t.mk
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ else
SGX_EDGER8R := $(BUILD_DIR)/sgx_edger8r
SGX_SDK_INC := $(COMMON_DIR)/inc
LIBCXX_INC := $(LINUX_SDK_DIR)/tlibcxx/include
else ifeq ($(LINUX_SGX_BUILD), 2)
include ../../../../../QuoteGeneration/buildenv.mk
SGX_EDGER8R := $(TD_MIGRATION_STD_LIB_PATH)/sgx_edger8r
SGX_SDK_INC := $(TD_MIGRATION_STD_INC_PATH)
LIBCXX_INC := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include
else
SGX_LIBRARY_PATH := $(SGX_SDK)/lib64
SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x64/sgx_sign
Expand Down