From 0f70dd40c57192e0bed18b864b9f2171c4918785 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Tue, 2 May 2023 12:40:33 +0100
Subject: [PATCH] SOC1-167: Update arm c compiler tool name

---
 system/testcodes/bootloader/makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/testcodes/bootloader/makefile b/system/testcodes/bootloader/makefile
index cbcdeed..e2d4b56 100644
--- a/system/testcodes/bootloader/makefile
+++ b/system/testcodes/bootloader/makefile
@@ -129,8 +129,10 @@ COMPILE_MICROLIB = 0
 COMPILE_SMALLMUL = 0
 
 ifeq ($(TOOL_CHAIN),ds6)
+  CC_TOOL = armclang
   ARM_CC_TARGET = --target=arm-$(TARGET)
 else
+  CC_TOOL = armcc
   ARM_CC_TARGET = -Otime
 endif
 
@@ -185,10 +187,10 @@ all_ds6 : $(BOOTLOADER).hex $(BOOTLOADER).lst
 
 
 $(BOOTLOADER).o :  $(SOFTWARE_DIR)/common/bootloader/$(BOOTLOADER).c $(DEPS_LIST)
-	armcc $(ARM_CC_OPTIONS) $(CPU_TYPE) $< -o  $@
+	$(CC_TOOL) $(ARM_CC_OPTIONS) $(CPU_TYPE) $< -o  $@
 
 $(SYSTEM_FILE).o : $(DEVICE_DIR)/Source/$(SYSTEM_FILE).c $(DEPS_LIST)
-	armcc $(ARM_CC_OPTIONS) $(CPU_TYPE) $< -o  $@
+	$(CC_TOOL) $(ARM_CC_OPTIONS) $(CPU_TYPE) $< -o  $@
 
 $(STARTUP_FILE).o : $(STARTUP_DIR)/$(STARTUP_FILE).s $(DEPS_LIST)
 	armasm $(ARM_ASM_OPTIONS) $(CPU_TYPE) $< -o  $@
-- 
GitLab