X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-metal%2Ffiles%2Fmtce-do-not-use-which-to-check-CC.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-metal%2Ffiles%2Fmtce-do-not-use-which-to-check-CC.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=551373c2e340f0ed1199f14579dfe23f0bc187aa;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-metal/files/mtce-do-not-use-which-to-check-CC.patch b/meta-starlingx/meta-stx-flock/stx-metal/files/mtce-do-not-use-which-to-check-CC.patch
deleted file mode 100644
index 551373c..0000000
--- a/meta-starlingx/meta-stx-flock/stx-metal/files/mtce-do-not-use-which-to-check-CC.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 840f382ee691596474966f74bd1be37722bbc91c Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 9 Jun 2020 20:52:31 +0800
-Subject: [PATCH] mtce: do not use which to check CC
-
-Upstream-Status: Inappropriate [OE cross-compile specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- common/Makefile        | 4 +---
- public/Makefile        | 4 +---
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/common/Makefile b/common/Makefile
-index 229a1a3..f797724 100755
---- a/common/Makefile
-+++ b/common/Makefile
-@@ -17,9 +17,7 @@ CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11
- STATIC_ANALYSIS_TOOL = cppcheck
- STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0)
-
--ifeq (,$(shell which ${CC}))
--CC=g++
--endif
-+CC ?= g++
-
- .cpp.o:
- 	$(CXX) $(CCFLAGS) $(INCLUDES) $(EXTRACCFLAGS) -c $< -o $@
-diff --git a/public/Makefile b/public/Makefile
-index 403638f..7dd80e4 100644
---- a/public/Makefile
-+++ b/public/Makefile
-@@ -13,9 +13,7 @@ LDFLAGS = -shared
- CFLAGS = -fPIC -g -O2 -Wall -Wextra -Werror
- TARGET_LIB = libamon.so
- lib: build
--ifeq (,$(shell which ${CC}))
--CC=gcc
--endif
-+CC ?= gcc
-
- STATIC_ANALYSIS_TOOL = cppcheck
- STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0)
---
-2.7.4