@@ -37,21 +37,21 @@ SGX_ARCH ?= x64
37
37
SGX_DEBUG ?= 1
38
38
39
39
ifeq ($(shell getconf LONG_BIT) , 32)
40
- SGX_ARCH := x86
40
+ SGX_ARCH := x86
41
41
else ifeq ($(findstring -m32, $(CXXFLAGS)), -m32)
42
- SGX_ARCH := x86
42
+ SGX_ARCH := x86
43
43
endif
44
44
45
45
ifeq ($(SGX_ARCH ) , x86)
46
- SGX_COMMON_FLAGS := -m32
47
- SGX_LIBRARY_PATH := $(SGX_SDK)/lib
48
- SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x86/sgx_sign
49
- SGX_EDGER8R := $(SGX_SDK)/bin/x86/sgx_edger8r
46
+ SGX_COMMON_FLAGS := -m32
47
+ SGX_LIBRARY_PATH := $(SGX_SDK ) /lib
48
+ SGX_ENCLAVE_SIGNER := $(SGX_SDK ) /bin/x86/sgx_sign
49
+ SGX_EDGER8R := $(SGX_SDK ) /bin/x86/sgx_edger8r
50
50
else
51
- SGX_COMMON_FLAGS := -m64
52
- SGX_LIBRARY_PATH := $(SGX_SDK)/lib64
53
- SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x64/sgx_sign
54
- SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
51
+ SGX_COMMON_FLAGS := -m64
52
+ SGX_LIBRARY_PATH := $(SGX_SDK ) /lib64
53
+ SGX_ENCLAVE_SIGNER := $(SGX_SDK ) /bin/x64/sgx_sign
54
+ SGX_EDGER8R := $(SGX_SDK ) /bin/x64/sgx_edger8r
55
55
endif
56
56
57
57
ifeq ($(SGX_DEBUG ) , 1)
61
61
endif
62
62
63
63
ifeq ($(SGX_DEBUG ) , 1)
64
- SGX_COMMON_FLAGS += -O0 -g
64
+ SGX_COMMON_FLAGS += -O0 -g
65
65
else
66
- SGX_COMMON_FLAGS += -O2
66
+ SGX_COMMON_FLAGS += -O2
67
67
endif
68
68
69
69
SGX_COMMON_FLAGS += -Wall -Wextra -Winit-self -Wpointer-arith -Wreturn-type \
@@ -76,9 +76,9 @@ SGX_COMMON_CXXFLAGS := $(SGX_COMMON_FLAGS) -Wnon-virtual-dtor -std=c++11
76
76
# ####### App Settings ########
77
77
78
78
ifneq ($(SGX_MODE ) , HW)
79
- Urts_Library_Name := sgx_urts_sim
79
+ Urts_Library_Name := sgx_urts_sim
80
80
else
81
- Urts_Library_Name := sgx_urts
81
+ Urts_Library_Name := sgx_urts
82
82
endif
83
83
84
84
App_Cpp_Files := App/App.cpp
@@ -111,11 +111,11 @@ App_Name := app
111
111
# ####### Enclave Settings ########
112
112
113
113
ifneq ($(SGX_MODE ) , HW)
114
- Trts_Library_Name := sgx_trts_sim
115
- Service_Library_Name := sgx_tservice_sim
114
+ Trts_Library_Name := sgx_trts_sim
115
+ Service_Library_Name := sgx_tservice_sim
116
116
else
117
- Trts_Library_Name := sgx_trts
118
- Service_Library_Name := sgx_tservice
117
+ Trts_Library_Name := sgx_trts
118
+ Service_Library_Name := sgx_tservice
119
119
endif
120
120
Crypto_Library_Name := sgx_tcrypto
121
121
0 commit comments