Revert "Revert "oran-shell-release: release image for F""
[pti/rtp.git] / meta-starlingx / meta-stx-flock / stx-metal / files / mtce-common-do-not-use-which-to-check-CC.patch
1 From 840f382ee691596474966f74bd1be37722bbc91c Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Tue, 9 Jun 2020 20:52:31 +0800
4 Subject: [PATCH] mtce-common: do not use which to check CC
5
6 Upstream-Status: Inappropriate [OE cross-compile specific]
7
8 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9 ---
10  common/Makefile | 4 +---
11  1 files changed, 1 insertions(+), 3 deletions(-)
12
13 diff --git a/common/Makefile b/common/Makefile
14 index e0a5574..d44eef6 100755
15 --- a/common/Makefile
16 +++ b/common/Makefile
17 @@ -54,9 +54,7 @@ CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11
18  STATIC_ANALYSIS_TOOL = cppcheck
19  STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0)
20
21 -ifeq (,$(shell which ${CC}))
22 -CC=g++
23 -endif
24 +CC ?= g++
25
26  .cpp.o:
27         $(CXX) $(CCFLAGS) $(INCLUDES) $(EXTRACCFLAGS) -c $< -o $@
28 --
29 2.7.4