Skip to content

Commit 447229b

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 8d0977a commit 447229b

File tree

1 file changed

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

1 file changed

+11
-10
lines changed

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

Lines changed: 11 additions & 10 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,8 +44,8 @@ endif
4344

4445
Crypto_Library_Name := sgx_tcrypto
4546

46-
$(EnclaveName)_C_Files := trusted/$(enclaveName).c
47-
$(EnclaveName)_Include_Paths := -IInclude -Itrusted -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx
47+
$(EnclaveName)_C_Files := $(TRUSTED_DIR)/$(enclaveName).c
48+
$(EnclaveName)_Include_Paths := -IInclude -I$(TRUSTED_DIR) -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx
4849

4950
Flags_Just_For_C := -Wno-implicit-function-declaration -std=c11
5051
Common_C_Cpp_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $($(EnclaveName)_Include_Paths) -fno-builtin-printf -I.
@@ -56,7 +57,7 @@ $(EnclaveName)_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -
5657
-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
5758
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
5859
-Wl,--defsym,__ImageBase=0 \
59-
-Wl,--version-script=trusted/$(enclaveName).lds
60+
-Wl,--version-script=$(TRUSTED_DIR)/$(enclaveName).lds
6061

6162
$(EnclaveName)_C_Objects := $($(EnclaveName)_C_Files:.c=.o)
6263

@@ -92,24 +93,24 @@ endif
9293

9394
######## $(enclaveName) Objects ########
9495

95-
trusted/$(enclaveName)_t.c: $(SGX_EDGER8R) ./trusted/$(enclaveName).edl
96-
@cd ./trusted && $(SGX_EDGER8R) --trusted ../trusted/$(enclaveName).edl --search-path ../trusted --search-path $(SGX_SDK)/include
96+
$(TRUSTED_DIR)/$(enclaveName)_t.c: $(SGX_EDGER8R) ./$(TRUSTED_DIR)/$(enclaveName).edl
97+
@cd ./$(TRUSTED_DIR) && $(SGX_EDGER8R) --trusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
9798
@echo "GEN => $@"
9899

99-
trusted/$(enclaveName)_t.o: ./trusted/$(enclaveName)_t.c
100+
$(TRUSTED_DIR)/$(enclaveName)_t.o: ./$(TRUSTED_DIR)/$(enclaveName)_t.c
100101
@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
101102
@echo "CC <= $<"
102103

103-
trusted/%.o: trusted/%.c
104+
$(TRUSTED_DIR)/%.o: $(TRUSTED_DIR)/%.c
104105
@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
105106
@echo "CC <= $<"
106107

107-
$(enclaveName).so: trusted/$(enclaveName)_t.o $($(EnclaveName)_C_Objects)
108+
$(enclaveName).so: $(TRUSTED_DIR)/$(enclaveName)_t.o $($(EnclaveName)_C_Objects)
108109
@$(CXX) $^ -o $@ $($(EnclaveName)_Link_Flags)
109110
@echo "LINK => $@"
110111

111112
$(enclaveName).signed.so: $(enclaveName).so
112-
@$(SGX_ENCLAVE_SIGNER) sign -key trusted/$(enclaveName)_private.pem -enclave $(enclaveName).so -out $@ -config trusted/$(enclaveName).config.xml
113+
@$(SGX_ENCLAVE_SIGNER) sign -key $(TRUSTED_DIR)/$(enclaveName)_private.pem -enclave $(enclaveName).so -out $@ -config $(TRUSTED_DIR)/$(enclaveName).config.xml
113114
@echo "SIGN => $@"
114115
clean:
115-
@rm -f $(enclaveName).* trusted/$(enclaveName)_t.* $($(EnclaveName)_C_Objects)
116+
@rm -f $(enclaveName).* $(TRUSTED_DIR)/$(enclaveName)_t.* $($(EnclaveName)_C_Objects)

0 commit comments

Comments
 (0)