Skip to content

Commit c90750a

Browse files
author
icarolima
committed
Adds TRUSTED_DIR to maintain the same pattern as sgx_u.mk.
Signed-off-by: Ícaro Dantas de Araújo Lima <icaro.lima@ccc.ufcg.edu.br>
1 parent bf22963 commit c90750a

File tree

1 file changed

+8
-7
lines changed
  • Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c

1 file changed

+8
-7
lines changed

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c/sgx_t_static.mk

Lines changed: 8 additions & 7 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=static_trusted
56

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

4445
Crypto_Library_Name := sgx_tcrypto
4546

46-
$(EnclaveName)_C_Files := static_trusted/$(enclaveName).c
47+
$(EnclaveName)_C_Files := $(TRUSTED_DIR)/$(enclaveName).c
4748
$(EnclaveName)_Include_Paths := -IInclude -I$(EnclaveName) -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
@@ -75,21 +76,21 @@ all: lib$(enclaveName).sgx.static.lib.a
7576

7677
######## $(enclaveName) Objects ########
7778

78-
static_trusted/$(enclaveName)_t.h: $(SGX_EDGER8R) ./static_trusted/$(enclaveName).edl
79-
@cd ./static_trusted && $(SGX_EDGER8R) --header-only --trusted ../static_trusted/$(enclaveName).edl --search-path ../static_trusted --search-path $(SGX_SDK)/include
79+
$(TRUSTED_DIR)/$(enclaveName)_t.h: $(SGX_EDGER8R) ./$(TRUSTED_DIR)/$(enclaveName).edl
80+
@cd ./$(TRUSTED_DIR) && $(SGX_EDGER8R) --header-only --trusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
8081
@echo "GEN => $@"
8182

82-
static_trusted/$(enclaveName)_t.o: ./trusted/$(enclaveName)_t.c
83+
$(TRUSTED_DIR)/$(enclaveName)_t.o: ./trusted/$(enclaveName)_t.c
8384
@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
8485
@echo "CC <= $<"
8586

86-
static_trusted/%.o: static_trusted/%.c
87+
$(TRUSTED_DIR)/%.o: $(TRUSTED_DIR)/%.c
8788
@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
8889
@echo "CC <= $<"
8990

90-
lib$(enclaveName).sgx.static.lib.a: static_trusted/$(enclaveName)_t.h $($(EnclaveName)_C_Objects)
91+
lib$(enclaveName).sgx.static.lib.a: $(TRUSTED_DIR)/$(enclaveName)_t.h $($(EnclaveName)_C_Objects)
9192
ar rcs lib$(enclaveName).sgx.static.lib.a $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)
9293
@echo "LINK => $@"
9394

9495
clean:
95-
@rm -f $(enclaveName).* static_trusted/$(enclaveName)_t.* $($(EnclaveName)_C_Objects)
96+
@rm -f $(enclaveName).* $(TRUSTED_DIR)/$(enclaveName)_t.* $($(EnclaveName)_C_Objects)

0 commit comments

Comments
 (0)