From a5e35c922b40a634b3d7b01d92724b86df20758f Mon Sep 17 00:00:00 2001
From: wangyu <wangyu283@huawei.com>
Date: Fri, 9 Sep 2022 10:09:37 +0800
Subject: [PATCH] DCAP disabling the rpatch option

---
 .../QuoteGeneration/buildenv.mk                            | 7 +------
 .../QuoteGeneration/quote_wrapper/ql/linux/Makefile        | 2 +-
 .../tools/PCKCertSelection/PCKSelectionSample/Makefile     | 2 +-
 .../tools/PCKRetrievalTool/Makefile                        | 2 +-
 .../tools/PCKRetrievalTool/Qpl/linux/Makefile              | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/external/dcap_source/QuoteGeneration/buildenv.mk b/external/dcap_source/QuoteGeneration/buildenv.mk
index 8c87626e..f05ccdaf 100644
--- a/external/dcap_source/QuoteGeneration/buildenv.mk
+++ b/external/dcap_source/QuoteGeneration/buildenv.mk
@@ -104,12 +104,7 @@
 endif
 
 # turn on stack protector for SDK
-CC_BELOW_4_9 := $(shell expr "`$(CC) -dumpversion`" \< "4.9")
-ifeq ($(CC_BELOW_4_9), 1)
-    COMMON_FLAGS += -fstack-protector
-else
-    COMMON_FLAGS += -fstack-protector-strong
-endif
+COMMON_FLAGS += -fstack-protector-strong
 
 ifdef DEBUG
     COMMON_FLAGS += -O0 -ggdb -DDEBUG -UNDEBUG
diff --git a/external/dcap_source/tools/PCKRetrievalTool/Makefile b/external/dcap_source/tools/PCKRetrievalTool/Makefile
index 4596ee9c..116db7d2 100644
--- a/external/dcap_source/tools/PCKRetrievalTool/Makefile
+++ b/external/dcap_source/tools/PCKRetrievalTool/Makefile
@@ -111,3 +111,2 @@
 ifeq ($(STANDALONE), 1)
-	App_Link_Flags += -Wl,-rpath=.
 endif
-- 
2.33.0