From 8a8313f461fbb08f6a5837535b25017ba4c242c8 Mon Sep 17 00:00:00 2001
From: Raptor Engineering Development Team <support@raptorengineering.com>
Date: Thu, 4 Jan 2018 14:32:19 -0600
Subject: Allow split of HOST and TARGET toolchain binary names

---
 tools/build/rules.dir/cc.rules.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tools/build/rules.dir/cc.rules.mk')

diff --git a/tools/build/rules.dir/cc.rules.mk b/tools/build/rules.dir/cc.rules.mk
index 173a1fdb..6d70bc9d 100644
--- a/tools/build/rules.dir/cc.rules.mk
+++ b/tools/build/rules.dir/cc.rules.mk
@@ -41,7 +41,7 @@ else
 		$(C2) "    C++$(1)    $$(@F)"
 endif
 		$(C1) mkdir -p $$(@D)
-		$(C1) $$($(1)_PREFIX)$$(CXX) $$(COMMONFLAGS) $$(CXXFLAGS) \
+		$(C1) $$($(1)_PREFIX)$$($(1)_CXX) $$(COMMONFLAGS) $$(CXXFLAGS) \
 			$$(LOCALCOMMONFLAGS) $$(LOCALCXXFLAGS) \
 			$$< -c -o $$@
 endef
@@ -53,7 +53,7 @@ else
 		$(C2) "    CC$(1)     $$(@F)"
 endif
 		$(C1) mkdir -p $$(@D)
-		$(C1) $$($(1)_PREFIX)$$(CC) $$(COMMONFLAGS) $$(CFLAGS) \
+		$(C1) $$($(1)_PREFIX)$$($(1)_CC) $$(COMMONFLAGS) $$(CFLAGS) \
 			$$(LOCALCOMMONFLAGS) $$(LOCALCFLAGS) \
 			$$< -c -o $$@
 endef
@@ -65,7 +65,7 @@ else
 		$(C2) "    LDSO$(1)   $$(@F)"
 endif
 		$(C1) mkdir -p $$(@D)
-		$(C1) $$($(1)_PREFIX)$$(CXX) $$(LDFLAGS) \
+		$(C1) $$($(1)_PREFIX)$$($(1)_CXX) $$(LDFLAGS) \
 			-shared  $$(addprefix -L,$(FAPI2_PLAT_LIB)) $$(LOCALLDFLAGS) \
 			$$(patsubst lib%.so,-l%, $$(notdir $$(filter %.so, $$^))) \
 			-Wl,--whole-archive \
@@ -83,7 +83,7 @@ else
 		$(C2) "    LD$(1)     $$(@F)"
 endif
 		$(C1) mkdir -p $$(@D)
-		$(C1) $$($(1)_PREFIX)$$(CXX) $$(LDFLAGS)  \
+		$(C1) $$($(1)_PREFIX)$$($(1)_CXX) $$(LDFLAGS)  \
 			$$(addprefix -L,$(FAPI2_PLAT_LIB)) $$(LOCALLDFLAGS) \
 			$$(patsubst lib%.so,-l%, $$(notdir $$(filter %.so, $$^))) \
 			-Wl,--whole-archive \
@@ -101,7 +101,7 @@ else
 endif
 		$(C1) mkdir -p $$(@D)
 		$(C1) rm -f $$@
-		$(C1) $$($(1)_PREFIX)$$(AR) rcs $$@ $$^
+		$(C1) $$($(1)_PREFIX)$$($(1)_AR) rcs $$@ $$^
 endef
 
 define __CALL_CXX_DEP
@@ -111,7 +111,7 @@ else
 		$(C2) "    DEP$(1)    $$(@F:.o=.dep)"
 endif
 		$(C1) mkdir -p $$(@D)
-		$(C1) $$($(1)_PREFIX)$$(CXX) -M -MP -MT $$@ \
+		$(C1) $$($(1)_PREFIX)$$($(1)_CXX) -M -MP -MT $$@ \
 			$$(COMMONFLAGS) $$(CXXFLAGS) \
 			$$(LOCALCOMMONFLAGS) $$(LOCALCXXFLAGS) \
 			$$< -o $$(subst .o,.dep,$$@)
@@ -124,7 +124,7 @@ else
 		$(C2) "    DEP$(1)    $$(@F:.o=.dep)"
 endif
 		$(C1) mkdir -p $$(@D)
-		$(C1) $$($(1)_PREFIX)$$(CC) -M -MP -MT $$@ \
+		$(C1) $$($(1)_PREFIX)$$($(1)_CC) -M -MP -MT $$@ \
 			$$(COMMONFLAGS) $$(CFLAGS) \
 			$$(LOCALCOMMONFLAGS) $$(LOCALCFLAGS) \
 			$$< -o $$(subst .o,.dep,$$@)
-- 
cgit v1.2.1