Skip to content

Commit 99e961d

Browse files
author
icarolima
committed
Refact TRUSTED_DIR -> SGXEnclave/makefiles/c++/sgx_u.mk
Signed-off-by: Ícaro Dantas de Araújo Lima <icaro.lima@ccc.ufcg.edu.br>
1 parent 62286f1 commit 99e961d

File tree

2 files changed

+4
-3
lines changed
  • Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c++

2 files changed

+4
-3
lines changed

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c++/sgx_t.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ endif
102102
######## $(enclaveName) Objects ########
103103

104104
$(TRUSTED_DIR)/$(enclaveName)_t.c: $(SGX_EDGER8R) ./$(TRUSTED_DIR)/$(enclaveName).edl
105-
@cd ./$(TRUSTED_DIR) && $(SGX_EDGER8R) --$(TRUSTED_DIR) ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
105+
@cd ./$(TRUSTED_DIR) && $(SGX_EDGER8R) --trusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
106106
@echo "GEN => $@"
107107

108108
$(TRUSTED_DIR)/$(enclaveName)_t.o: ./$(TRUSTED_DIR)/$(enclaveName)_t.c

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c++/sgx_u.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
SGX_SDK ?= $(SdkPathFromPlugin)
33
SGX_MODE ?= SIM
44
SGX_ARCH ?= x64
5+
TRUSTED_DIR=trusted
56
UNTRUSTED_DIR=untrusted
67

78
ifeq ($(shell getconf LONG_BIT), 32)
@@ -106,8 +107,8 @@ endif
106107

107108
######## App Objects ########
108109

109-
$(UNTRUSTED_DIR)/$(enclaveName)_u.c: $(SGX_EDGER8R) trusted/$(enclaveName).edl
110-
@cd $(UNTRUSTED_DIR) && $(SGX_EDGER8R) --untrusted ../trusted/$(enclaveName).edl --search-path ../trusted --search-path $(SGX_SDK)/include
110+
$(UNTRUSTED_DIR)/$(enclaveName)_u.c: $(SGX_EDGER8R) $(TRUSTED_DIR)/$(enclaveName).edl
111+
@cd $(UNTRUSTED_DIR) && $(SGX_EDGER8R) --untrusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
111112
@echo "GEN => $@"
112113

113114
$(UNTRUSTED_DIR)/$(enclaveName)_u.o: $(UNTRUSTED_DIR)/$(enclaveName)_u.c

0 commit comments

Comments
 (0)