km: Resolve Linux build warnings

Compiler warnings were observed at DDK Kernel build at PSDK. They are
caused by the double prefixes of $CC as $(CROSS_COMPILE)$(CROSS_COMPILE)gcc
because $CC is already set to (CROSS_COMPILE)gcc at Rules.make at PSDK.
This problem can be resolved by adding a "string contains" check to make
the $CC prefix operation conditional. The proposed fixes have been submitted
to IMG and approved by IMG engineers as ticket 101146

Please note that we only made minimum changes to resolve the compiler warnings and
there is no intention to enhance the IMG make procedures to handle all similar cases.

Change-Id: I54d27af799863fff5662de2050a93e2498c2ed82
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Reviewed-on: https://gerrit.ext.ti.com/gerrit/omap/14288
Reviewed-by: Anand Balagopalakrishnan <anandb@ti.com>

2 files changed, 6 insertions, 0 deletions

diff --git a/eurasia_km/eurasiacon/build/linux2/commands.mk b/eurasia_km/eurasiacon/build/linux2/commands.mk
index cb92174..a5cef58 100644
--- a/eurasia_km/eurasiacon/build/linux2/commands.mk
+++ b/eurasia_km/eurasiacon/build/linux2/commands.mk
@@ -224,7 +224,11 @@ override CXX := $(if $(V),,@)$(CCACHE) $(CXX) \
  -target $(patsubst %-,%,$(CROSS_COMPILE)) \
  -B$(dir $(shell which $(CROSS_COMPILE)gcc))
 else
+ifeq (,$(findstring $(CROSS_COMPILE), $(CC)))
 override CC  := $(if $(V),,@)$(CCACHE) $(CROSS_COMPILE)$(CC)
+else
+override CC  := $(if $(V),,@)$(CCACHE) $(CC)
+endif
 override CXX := $(if $(V),,@)$(CCACHE) $(CROSS_COMPILE)$(CXX)
 endif
 else
diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk b/eurasia_km/eurasiacon/build/linux2/config/core.mk
index 30ba321..08ff716 100644
--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk
+++ b/eurasia_km/eurasiacon/build/linux2/config/core.mk
@@ -228,8 +228,10 @@ _CLANG	:= \
 ifeq ($(_CLANG),true)
 _CC             := $(_CC) -target $(patsubst %-,%,$(CROSS_COMPILE))
 else
+ifeq (,$(findstring $(CROSS_COMPILE), $(_CC)))
 _CC             := $(CROSS_COMPILE)$(_CC)
 endif
+endif
 HOST_CC ?= gcc
 
 -include ../config/user-defs.mk