From 840f382ee691596474966f74bd1be37722bbc91c Mon Sep 17 00:00:00 2001 From: Jackie Huang 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 --- 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