Skip to content

Commit c1ceb4f

Browse files
authoredJul 2, 2024
Fix misused tabs in Makefiles (#1018)
Signed-off-by: SharzyL <me@sharzy.in>
1 parent 29321db commit c1ceb4f

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed
 

‎SampleCode/Switchless/Makefile

+18-18
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ SGX_ARCH ?= x64
3737
SGX_DEBUG ?= 1
3838

3939
ifeq ($(shell getconf LONG_BIT), 32)
40-
SGX_ARCH := x86
40+
SGX_ARCH := x86
4141
else ifeq ($(findstring -m32, $(CXXFLAGS)), -m32)
42-
SGX_ARCH := x86
42+
SGX_ARCH := x86
4343
endif
4444

4545
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
5050
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
5555
endif
5656

5757
ifeq ($(SGX_DEBUG), 1)
@@ -61,9 +61,9 @@ endif
6161
endif
6262

6363
ifeq ($(SGX_DEBUG), 1)
64-
SGX_COMMON_FLAGS += -O0 -g
64+
SGX_COMMON_FLAGS += -O0 -g
6565
else
66-
SGX_COMMON_FLAGS += -O2
66+
SGX_COMMON_FLAGS += -O2
6767
endif
6868

6969
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
7676
######## App Settings ########
7777

7878
ifneq ($(SGX_MODE), HW)
79-
Urts_Library_Name := sgx_urts_sim
79+
Urts_Library_Name := sgx_urts_sim
8080
else
81-
Urts_Library_Name := sgx_urts
81+
Urts_Library_Name := sgx_urts
8282
endif
8383

8484
App_Cpp_Files := App/App.cpp
@@ -111,11 +111,11 @@ App_Name := app
111111
######## Enclave Settings ########
112112

113113
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
116116
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
119119
endif
120120
Crypto_Library_Name := sgx_tcrypto
121121

‎psw/ae/aesm_service/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ ifeq ($(BUILD_REF_LE), 1)
4747
endif
4848

4949
ifeq ($(ARCH), x86)
50-
SQLITECFLAGS += -m32
50+
SQLITECFLAGS += -m32
5151
else
52-
SQLITECFLAGS += -m64
52+
SQLITECFLAGS += -m64
5353
endif
5454

5555
ifdef PROFILE
56-
CXXFLAGS += -D_PROFILE_
57-
CFLAGS += -D_PROFILE_
56+
CXXFLAGS += -D_PROFILE_
57+
CFLAGS += -D_PROFILE_
5858
endif
5959

6060
CXXFLAGS += -fpie

‎sdk/debugger_interface/linux/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ CPPFLAGS += -I$(COMMON_DIR)/inc/ \
3939

4040
CFLAGS += -W -Wall -Werror -D_GNU_SOURCE -fpic
4141
ifeq ($(CC_BELOW_4_9), 1)
42-
CFLAGS += -fstack-protector
42+
CFLAGS += -fstack-protector
4343
else
44-
CFLAGS += -fstack-protector-strong
44+
CFLAGS += -fstack-protector-strong
4545
endif
4646
LDLIBS += -ldl
4747

‎sdk/protected_code_loader/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434
include ../../buildenv.mk
3535

3636
ifndef VERBOSE
37-
PCLVERBOSE := @
37+
PCLVERBOSE := @
3838
else
39-
PCLVERBOSE :=
39+
PCLVERBOSE :=
4040
endif
4141

4242
# optimize bug on GCC 13.3.2, we need to disable optimize when build with GCC 13.3.2
4343
CC_NO_LESS_THAN_13 := $(shell expr $(CC_VERSION) \>\= "13")
4444

4545
ifeq ($(ARCH), x86)
46-
$(error x86 build is not supported, only x64!!)
46+
$(error x86 build is not supported, only x64!!)
4747
endif
4848

4949
# output dir for simulation build objects

‎sdk/tlibcrypto/Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ SHARED_OBJ = tcrypto_version.o sgx_common_init_ipp.o
4545
ifeq ($(USE_CRYPTO_LIB), 0)
4646
# Build SGXSSL based sgx_tcrypto library
4747
ifeq ($(ARCH), x86_64)
48-
OPENSSL_PACKAGE = $(LINUX_EXTERNAL_DIR)/sgxssl/Linux/package
48+
OPENSSL_PACKAGE = $(LINUX_EXTERNAL_DIR)/sgxssl/Linux/package
4949
else
50-
$(error SGXSSL doesn't support 32bit)
50+
$(error SGXSSL doesn't support 32bit)
5151
endif #($(ARCH), x86_64)
5252

5353
ifeq ($(MITIGATION-CVE-2020-0551), LOAD)
@@ -59,12 +59,12 @@ OPENSSL_LIBRARY_PATH := $(OPENSSL_PACKAGE)/lib64
5959
endif
6060

6161
ifdef DEBUG
62-
OpenSSL_Crypto_Library_Name := sgx_tsgxssl_cryptod
63-
SGXSSL_Library_Name := sgx_tsgxssld
64-
SGX_COMMON_CFLAGS += -O0
62+
OpenSSL_Crypto_Library_Name := sgx_tsgxssl_cryptod
63+
SGXSSL_Library_Name := sgx_tsgxssld
64+
SGX_COMMON_CFLAGS += -O0
6565
else
66-
OpenSSL_Crypto_Library_Name := sgx_tsgxssl_crypto
67-
SGXSSL_Library_Name := sgx_tsgxssl
66+
OpenSSL_Crypto_Library_Name := sgx_tsgxssl_crypto
67+
SGXSSL_Library_Name := sgx_tsgxssl
6868
endif
6969

7070
PREPARE_SGXSSL := $(LINUX_EXTERNAL_DIR)/sgxssl/prepare_sgxssl.sh

0 commit comments

Comments
 (0)