align the environmental variable names from TD

Signed-off-by: He, Jing J <[email protected]>

Author: He, Jing J

Linux/sgx/libsgx_tsgxssl/Makefile

@@ -50,6 +50,11 @@ else
 		SGX_EDGER8R := $(BUILD_DIR)/sgx_edger8r
 		SGX_SDK_INC := $(COMMON_DIR)/inc
 		LIBCXX_INC := $(LINUX_SDK_DIR)/tlibcxx/include
+	else ifeq ($(LINUX_SGX_BUILD), 2)
+		include ../../../../../QuoteGeneration/buildenv.mk
+		SGX_EDGER8R := $(SERVTD_ATTEST_STD_LIB_PATH)/sgx_edger8r
+		SGX_SDK_INC := $(SERVTD_ATTEST_STD_INC_PATH)
+		LIBCXX_INC := $(SERVTD_ATTEST_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include
 	else
 		SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
 		SGX_SDK_INC := $(SGX_SDK)/include

Linux/sgx/libsgx_usgxssl/Makefile

@@ -48,6 +48,11 @@ else
 		include ../../../../../buildenv.mk
 		SGX_EDGER8R := $(BUILD_DIR)/sgx_edger8r
 		SGX_SDK_INC := $(COMMON_DIR)/inc
+	else ifeq ($(LINUX_SGX_BUILD), 2)
+		include ../../../../../QuoteGeneration/buildenv.mk
+		SGX_EDGER8R := $(SERVTD_ATTEST_STD_LIB_PATH)/sgx_edger8r
+		SGX_SDK_INC := $(SERVTD_ATTEST_STD_INC_PATH)
+		LIBCXX_INC := $(SERVTD_ATTEST_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include
 	else
 		SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
 		SGX_SDK_INC := $(SGX_SDK)/include

Linux/sgx/test_app/sgx_t.mk

@@ -55,9 +55,9 @@ else
 		LIBCXX_INC := $(LINUX_SDK_DIR)/tlibcxx/include
 	else ifeq ($(LINUX_SGX_BUILD), 2)
                 include ../../../../../QuoteGeneration/buildenv.mk
-                SGX_EDGER8R := $(TD_MIGRATION_STD_LIB_PATH)/sgx_edger8r
-                SGX_SDK_INC := $(TD_MIGRATION_STD_INC_PATH)
-                LIBCXX_INC := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include
+                SGX_EDGER8R := $(SERVTD_ATTEST_STD_LIB_PATH)/sgx_edger8r
+                SGX_SDK_INC := $(SERVTD_ATTEST_STD_INC_PATH)
+                LIBCXX_INC := $(SERVTD_ATTEST_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include
 	else
 		SGX_LIBRARY_PATH := $(SGX_SDK)/lib64
 		SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x64/sgx_sign