Skip to content

Commit 62286f1

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

File tree

1 file changed

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

1 file changed

+12
-11
lines changed

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

Lines changed: 12 additions & 11 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

67
ifeq ($(shell getconf LONG_BIT), 32)
78
SGX_ARCH := x86
@@ -43,9 +44,9 @@ endif
4344

4445
Crypto_Library_Name := sgx_tcrypto
4546

46-
$(EnclaveName)_Cpp_Files := trusted/$(enclaveName).cpp
47+
$(EnclaveName)_Cpp_Files := $(TRUSTED_DIR)/$(enclaveName).cpp
4748
$(EnclaveName)_C_Files :=
48-
$(EnclaveName)_Include_Paths := -IInclude -Itrusted -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx
49+
$(EnclaveName)_Include_Paths := -IInclude -I$(TRUSTED_DIR) -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx
4950

5051

5152
Flags_Just_For_C := -Wno-implicit-function-declaration -std=c11
@@ -61,7 +62,7 @@ $(EnclaveName)_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -
6162
-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
6263
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
6364
-Wl,--defsym,__ImageBase=0 \
64-
-Wl,--version-script=trusted/$(enclaveName).lds
65+
-Wl,--version-script=$(TRUSTED_DIR)/$(enclaveName).lds
6566

6667
$(EnclaveName)_Cpp_Objects := $($(EnclaveName)_Cpp_Files:.cpp=.o)
6768
$(EnclaveName)_C_Objects := $($(EnclaveName)_C_Files:.c=.o)
@@ -100,28 +101,28 @@ endif
100101

101102
######## $(enclaveName) Objects ########
102103

103-
trusted/$(enclaveName)_t.c: $(SGX_EDGER8R) ./trusted/$(enclaveName).edl
104-
@cd ./trusted && $(SGX_EDGER8R) --trusted ../trusted/$(enclaveName).edl --search-path ../trusted --search-path $(SGX_SDK)/include
104+
$(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
105106
@echo "GEN => $@"
106107

107-
trusted/$(enclaveName)_t.o: ./trusted/$(enclaveName)_t.c
108+
$(TRUSTED_DIR)/$(enclaveName)_t.o: ./$(TRUSTED_DIR)/$(enclaveName)_t.c
108109
@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
109110
@echo "CC <= $<"
110111

111-
trusted/%.o: trusted/%.cpp
112+
$(TRUSTED_DIR)/%.o: $(TRUSTED_DIR)/%.cpp
112113
@$(CXX) $($(EnclaveName)_Cpp_Flags) -c $< -o $@
113114
@echo "CXX <= $<"
114115

115-
trusted/%.o: trusted/%.c
116+
$(TRUSTED_DIR)/%.o: $(TRUSTED_DIR)/%.c
116117
@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
117118
@echo "CC <= $<"
118119

119-
$(enclaveName).so: trusted/$(enclaveName)_t.o $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)
120+
$(enclaveName).so: $(TRUSTED_DIR)/$(enclaveName)_t.o $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)
120121
@$(CXX) $^ -o $@ $($(EnclaveName)_Link_Flags)
121122
@echo "LINK => $@"
122123

123124
$(enclaveName).signed.so: $(enclaveName).so
124-
@$(SGX_ENCLAVE_SIGNER) sign -key trusted/$(enclaveName)_private.pem -enclave $(enclaveName).so -out $@ -config trusted/$(enclaveName).config.xml
125+
@$(SGX_ENCLAVE_SIGNER) sign -key $(TRUSTED_DIR)/$(enclaveName)_private.pem -enclave $(enclaveName).so -out $@ -config $(TRUSTED_DIR)/$(enclaveName).config.xml
125126
@echo "SIGN => $@"
126127
clean:
127-
@rm -f $(enclaveName).* trusted/$(enclaveName)_t.* $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)
128+
@rm -f $(enclaveName).* $(TRUSTED_DIR)/$(enclaveName)_t.* $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)

0 commit comments

Comments
 (0)